diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | build.c | 6 | ||||
| -rw-r--r-- | build/Makefile.in | 2 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/cpio.c | 2 | ||||
| -rw-r--r-- | lib/oldheader.c | 10 | ||||
| -rw-r--r-- | misc/Makefile.in | 2 | ||||
| -rw-r--r-- | popt/Makefile.in | 6 | ||||
| -rw-r--r-- | tools/Makefile.in | 6 |
10 files changed, 21 insertions, 19 deletions
diff --git a/Makefile.in b/Makefile.in index dfe19995e..0fd5bbf3b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,7 @@ include Makefile.inc srcdir= @srcdir@ +VPATH = @srcdir@ top_srcdir= @top_srcdir@ INSTALL= @INSTALL@ @@ -19,8 +20,6 @@ CVSTAG = r$(subst .,-,$(VERSION)) ### These are variables meant to be exported -VPATH = $(srcdir) - BINDIR=$(prefix)/bin RPMBINDIR=$(subst usr/bin,bin,$(BINDIR)) MANDIR=$(prefix)/man/man8 @@ -1,3 +1,9 @@ +#include "config.h" + +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif + #include <ctype.h> #include <errno.h> #include <fcntl.h> diff --git a/build/Makefile.in b/build/Makefile.in index d92f686d8..c058d3134 100644 --- a/build/Makefile.in +++ b/build/Makefile.in @@ -1,6 +1,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH = $(srcdir) +VPATH = @srcdir@ LIBOBJECTS = \ misc.o parsePreamble.o part.o \ diff --git a/configure.in b/configure.in index 07e570e61..9dfb1efef 100644 --- a/configure.in +++ b/configure.in @@ -328,6 +328,7 @@ if test "$PO" = po; then fi AC_C_BIGENDIAN +AC_C_INLINE dnl look for libc features PROVIDES_ERRNO=no diff --git a/lib/Makefile.in b/lib/Makefile.in index 1113bac95..98fd93c39 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,5 +1,5 @@ srcdir = @srcdir@ -VPATH = $(srcdir) +VPATH = @srcdir@ top_srcdir = @top_srcdir@ LIBOBJECTS = header.o misc.o messages.o \ diff --git a/lib/cpio.c b/lib/cpio.c index c3069ab3c..4dce611a1 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -124,7 +124,7 @@ static inline int padoutfd(int fd, size_t * where, int modulo) { static int strntoul(const char * str, char ** endptr, int base, int num) { char * buf, * end; - unsigned long return; + unsigned long ret; buf = alloca(num + 1); strncpy(buf, str, num); diff --git a/lib/oldheader.c b/lib/oldheader.c index 649161033..e7ea27ff0 100644 --- a/lib/oldheader.c +++ b/lib/oldheader.c @@ -67,8 +67,8 @@ char * oldhdrReadFromStream(int fd, struct oldrpmHeader * header) { header->spec = malloc(header->specLength); header->name = malloc(strlen(lit.labelstr) + 1); if (!header->spec || !header->name) { - header->spec ? free(header->spec) : 0; - header->name ? free(header->name) : 0; + if (header->spec) free(header->spec); + if (header->name) free(header->name); return "out of memory"; } @@ -158,8 +158,8 @@ char * oldhdrReadFromFile(char * filename, struct oldrpmHeader * header) { void oldhdrFree(struct oldrpmHeader * header) { free(header->name); free(header->spec); - header->icon ? free(header->icon) : 0; - header->group ? free(header->group) : 0; + if (header->icon) free(header->icon); + if (header->group) free(header->group); } void oldhdrSpecFree(struct oldrpmHeaderSpec * spec) { @@ -337,7 +337,7 @@ void infoFromFields(char ** fields, struct oldrpmFileInfo * fi) { void oldrpmfileFree(struct oldrpmFileInfo * fi) { free(fi->path); - fi->linkto ? free(fi->linkto) : 0; + if (fi->linkto) free(fi->linkto); } char * oldrpmfileToInfoStr(struct oldrpmFileInfo * fi) { diff --git a/misc/Makefile.in b/misc/Makefile.in index d7365bb29..5e4c53ad1 100644 --- a/misc/Makefile.in +++ b/misc/Makefile.in @@ -1,6 +1,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH = $(srcdir) +VPATH = @srcdir@ include ../Makefile.inc diff --git a/popt/Makefile.in b/popt/Makefile.in index 58dc54f3e..d02c97a52 100644 --- a/popt/Makefile.in +++ b/popt/Makefile.in @@ -1,6 +1,6 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ -VPATH = @srcdir +VPATH = @srcdir@ LIBOBJECTS = popt.o @@ -27,7 +27,7 @@ ifeq ($(RANLIB),) RANLIB=ranlib endif -ifeq (.depend,$(wildcard .depend-done)) +ifeq (.depend-done,$(wildcard .depend-done)) TARGET=allprogs else TARGET=@TARGET@ @@ -37,7 +37,7 @@ $(LIBPOPT): $(LIBPOPT)($(LIBOBJECTS)) $(RANLIB) $@ distclean: clean - rm -f Makefile .depend-done + rm -f Makefile .depend-done config.log config.status clean: rm -f *.a *.o *~ $(PROGS) test.out tagtable.c diff --git a/tools/Makefile.in b/tools/Makefile.in index e8225ac25..4538e302a 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,5 +1,5 @@ srcdir = @srcdir@ -VPATH = $(srcdir) +VPATH = @srcdir@ top_srcdir = @top_srcdir@ include ../Makefile.inc @@ -7,11 +7,7 @@ include ../Makefile.inc PROGS = rpmlead rpmheader rpmarchive rpmsignature dump dumpdb LOADLIBES = @LIBS@ @LIBMISC@ @LIBINTL@ -ifeq (.depend,$(wildcard .depend)) TARGET=everything -else -TARGET=depend everything -endif all: $(TARGET) |