1) added changes which let RPM build in a directory other then its source

   directory
2) moved popt to autoconf

CVS patchset: 2005
CVS date: 1998/02/11 08:59:34

diff --git a/CREDITS b/CREDITS
index 88609ae..1a38bc0 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -13,6 +13,7 @@ Significant code, ideas, or porting help have been contributed by:
        Kit Cosper
        Kristof Depraetere
        Karl Eichwalder
+       Fred Fish
        David Fox
        Joseph L. Hartmann, Jr
        Jeff Johnson

diff --git a/Makefile.in b/Makefile.in
index 7a5a73b..a19ab0d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,12 +119,12 @@ install: all
            $(INSTALL) -s -m 755 rpm.shared $(installprefix)/$(RPMBINDIR)/rpm; \
        fi
        $(INSTALL) -m 755 $(srcdir)/gendiff $(installprefix)/$(BINDIR)
-       $(INSTALL) -m 755 $(srcdir)/find-provides.sh $(installprefix)/$(BINDIR)/find-provides
-       $(INSTALL) -m 755 $(srcdir)/find-requires.sh $(installprefix)/$(BINDIR)/find-requires
+       $(INSTALL) -m 755 $(topdir)/find-provides.sh $(installprefix)/$(BINDIR)/find-provides
+       $(INSTALL) -m 755 $(topdir)/find-requires.sh $(installprefix)/$(BINDIR)/find-requires
        $(INSTALL) -s -m 755 rpm2cpio $(installprefix)/$(BINDIR)
        $(INSTALL) -m 644 $(srcdir)/rpm.8 $(installprefix)/$(MANDIR)
        $(INSTALL) -m 644 $(srcdir)/rpm2cpio.8 $(installprefix)/$(MANDIR)
-       $(INSTALL) -m 644 $(srcdir)/lib-rpmrc $(installprefix)/$(LIBDIR)/rpmrc
+       $(INSTALL) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(LIBDIR)/rpmrc
        $(INSTALL) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt
        (cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
        for d in $(INSTSUBDIRS); do \

diff --git a/Makefile.inc.in b/Makefile.inc.in
index 291fdf7..fd7cee9 100644 (file)
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -1,4 +1,5 @@
 topdir=@topdir@
+topsrcdir=@topsrcdir@
 CPP = @CPP@
 prefix= @prefix@
 exec_prefix = @exec_prefix@
@@ -11,10 +12,10 @@ LIBRPMRC_FILENAME=$(libdir)/rpmrc
 LIBRPMALIAS_FILENAME=$(libdir)/rpmpopt
 RPMNLSDIR=@datadir@/locale
 RPMNLSPACKAGE=rpm
-CFLAGS = @CFLAGS@ @INCPATH@ $(WARNINGS) $(OPTS) -I$(topdir) \
-       -I$(topdir)/lib -I$(topdir)/misc -Wall -Wstrict-prototypes 
+CFLAGS = @CFLAGS@ @INCPATH@ $(WARNINGS) $(OPTS) -I$(topdir) -I$(topsrcdir)\
+       -I$(topsrcdir)/lib -I$(topsrcdir)/misc -Wall -Wstrict-prototypes 
 LDFLAGS = @LDFLAGS@ -L$(topdir)/lib -L$(topdir)/build -L$(topdir)/misc \
          -L$(topdir)/popt
-VERSION = 2.4.101
+VERSION = 2.4.102
 CC = @CC@
 

diff --git a/build/Makefile.in b/build/Makefile.in
index 29fdb07..0ceccb3 100644 (file)
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -14,7 +14,7 @@ LOADLIBES = -lrpm -lz ../popt/libpopt.a $(LIBEFENCE)
 
 # -----------------------------------------------------------------------
 
-include $(srcdir)/../Makefile.inc
+include ../Makefile.inc
 
 ifeq (.depend,$(wildcard .depend))
 TARGET=everything
@@ -32,7 +32,8 @@ $(LIBBUILD): $(LIBOBJECTS)
 
 $(PROGS): $(LIBOBJECTS)
 
-pack.o:
+# GNU make doesn't need the pack.c on here, but broken makes may
+pack.o: pack.c
        $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -o $@ -c $<
 
 clean:

diff --git a/configure.in b/configure.in
index 3ed19f3..1ebe1b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -82,6 +82,7 @@ if test "$cross_compiling" != "yes"; then
 fi
 
 topdir=`pwd`
+topsrcdir=`cd ${srcdir}; pwd`
 
 if test $prefix != "/usr" -a $prefix != "/usr/local"; then
        AC_MSG_CHECKING("$prefix/lib... $ac_c")
@@ -364,24 +365,27 @@ elif echo "$build_os" | grep sunos > /dev/null; then
 elif echo "$build_os" | grep hpux > /dev/null; then
        RPM=rpm.shared
        echo "hacking things up for hpux"
+elif echo "$build_os" | grep irix > /dev/null; then
+       RPM=rpm.shared
+       echo "hacking things up for irix"
 fi
 
 rm -f ./find-provides.sh
-if test -f autodeps/${build_os}.prov ; then
-       echo "using autodeps/$build_os.prov for automatic provides generation"
-       ln -s autodeps/${build_os}.prov ./find-provides.sh
+if test -f ${srcdir}/autodeps/${target_os}.prov ; then
+       echo "using ${srcdir}/autodeps/$build_os.prov for automatic provides generation"
+       ln -s ${srcdir}/autodeps/${build_os}.prov ./find-provides.sh
 else
-       echo "*** no default provides information is available for $build_os"
-       ln -s autodeps/none ./find-provides.sh
+       echo "*** no default provides information is available for $target_os"
+       ln -s ${srcdir}/autodeps/none ./find-provides.sh
 fi
 
 rm -f ./find-requires.sh
-if test -f autodeps/${build_os}.req ; then
-       echo "using autodeps/$build_os.req for automatic requires generation"
-       ln -s autodeps/$build_os.req ./find-requires.sh
+if test -f ${srcdir}/autodeps/${target_os}.req ; then
+       echo "using ${srcdir}/autodeps/$build_os.req for automatic requires generation"
+       ln -s ${srcdir}/autodeps/$build_os.req ./find-requires.sh
 else
-       echo "*** no default requires information is available for $build_os"
-       ln -s autodeps/none ./find-requires.sh
+       echo "*** no default requires information is available for $target_os"
+       ln -s ${srcdir}/autodeps/none ./find-requires.sh
 fi
 
 if test -n "$MISCOBJS" ; then
@@ -396,6 +400,7 @@ AC_SUBST(LIBINTL)
 AC_SUBST(varprefix)
 AC_SUBST(tmpdir)
 AC_SUBST(topdir)
+AC_SUBST(topsrcdir)
 AC_SUBST(INTLDEF)
 AC_SUBST(XGETTEXT)
 AC_SUBST(LIBINTL)
@@ -416,4 +421,5 @@ else
    NBMAKEFILE=
 fi
 
+AC_CONFIG_SUBDIRS(popt)
 AC_OUTPUT(Makefile Makefile.inc lib-rpmrc lib/Makefile build/Makefile $NBMAKEFILE tools/Makefile po/Makefile misc/Makefile)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index c24fe49..8fcaa2f 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -22,7 +22,7 @@ INSTALL_DATA= @INSTALL_DATA@
 
 # -----------------------------------------------------------------------
 
-include $(srcdir)/../Makefile.inc
+include ../Makefile.inc
 
 ifeq (.depend,$(wildcard .depend))
 TARGET=allprogs
@@ -34,10 +34,12 @@ all: $(TARGET)
 
 allprogs: $(LIBRPM) $(PROGS)
 
-misc.o:
+# GNU make doesn't need this, but stupid ones may
+misc.o: misc.c
        $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" -o $@ -c $<
 
-rpmrc.o:
+# ditto
+rpmrc.o: rpmrc.c
        $(CC) $(CFLAGS) -DLIBRPMRC_FILENAME="\"$(LIBRPMRC_FILENAME)"\" -o $@ -c $<
 
 $(PROGS): $(LIBRPM)

diff --git a/misc/Makefile.in b/misc/Makefile.in
index 0c66bf8..35ac3bb 100644 (file)
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -1,7 +1,7 @@
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
-include $(srcdir)/../Makefile.inc
+include ../Makefile.inc
 
 LIBOBJECTS = @MISCOBJS@ 
 LIBMISC = libmisc.a

diff --git a/po/Makefile.in b/po/Makefile.in
index 7f2136e..da1d640 100644 (file)
--- a/po/Makefile.in
+++ b/po/Makefile.in
@@ -1,7 +1,7 @@
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
-include $(srcdir)/../Makefile.inc
+include ../Makefile.inc
 
 INSTALL= @INSTALL@
 INSTALL_PROGRAM= @INSTALL_PROGRAM@
@@ -13,23 +13,23 @@ NLSPACKAGE = rpm
 
 CATALOGS = sv.mo fr.mo de.mo pt-br.mo tr.mo
 
-POTFILES  = $(topdir)/rpm.c            $(topdir)/query.c               \
-           $(topdir)/install.c         $(topdir)/verify.c              \
-           $(topdir)/checksig.c        $(topdir)/url.c                 \
-           $(topdir)/ftp.c             $(topdir)/url.c                 \
-           $(topdir)/lib/uninstall.c   $(topdir)/lib/rpmdb.c           \
-           $(topdir)/lib/signature.c   $(topdir)/lib/dbindex.c         \
-           $(topdir)/lib/depends.c     $(topdir)/lib/formats.c         \
-           $(topdir)/lib/fs.c          $(topdir)/lib/header.c          \
-           $(topdir)/lib/lookup.c      $(topdir)/lib/rebuilddb.c       \
-           $(topdir)/lib/messages.c    $(topdir)/lib/package.c         \
-           $(topdir)/lib/rpmlead.c     $(topdir)/lib/rpmrc.c           \
+POTFILES  = $(topsrcdir)/rpm.c                 $(topsrcdir)/query.c            \
+       $(topsrcdir)/install.c          $(topsrcdir)/verify.c           \
+       $(topsrcdir)/checksig.c         $(topsrcdir)/url.c              \
+       $(topsrcdir)/ftp.c                                              \
+       $(topsrcdir)/lib/uninstall.c    $(topsrcdir)/lib/rpmdb.c        \
+       $(topsrcdir)/lib/signature.c    $(topsrcdir)/lib/dbindex.c      \
+       $(topsrcdir)/lib/depends.c      $(topsrcdir)/lib/formats.c      \
+       $(topsrcdir)/lib/fs.c           $(topsrcdir)/lib/header.c       \
+       $(topsrcdir)/lib/lookup.c       $(topsrcdir)/lib/rebuilddb.c    \
+       $(topsrcdir)/lib/messages.c     $(topsrcdir)/lib/package.c      \
+       $(topsrcdir)/lib/rpmlead.c      $(topsrcdir)/lib/rpmrc.c
 
 all: $(NLSPACKAGE).pot $(CATALOGS)
 
 $(NLSPACKAGE).pot: $(POTFILES)
        xgettext --default-domain=$(NLSPACKAGE) \
-                 --add-comments --keyword=_ --keyword=N_ $(POTFILES)
+           --add-comments --keyword=_ --keyword=N_ $(POTFILES)
        if cmp -s $(NLSPACKAGE).po $(NLSPACKAGE).pot; then \
            rm -f $(NLSPACKAGE).po; \
        else \
@@ -47,7 +47,7 @@ update-po: Makefile
                if $(MSGMERGE) $$lang.old.po $(NLSPACKAGE).pot -o $$lang.po; then \
                rm -f $$lang.old.po; \
        else \
-               echo "msgmerge for $$cat failed!"; \
+               echo "msgmerge for $$cat failed!"; \
                rm -f $$lang.po; \
                mv $$lang.old.po $$lang.po; \
        fi; \

diff --git a/popt/Makefile b/popt/Makefile.in
similarity index 77%
rename from popt/Makefile
rename to popt/Makefile.in
index b76b25e..a44efde 100644 (file)
--- a/popt/Makefile
+++ b/popt/Makefile.in
@@ -1,21 +1,18 @@
+srcdir = @srcdir@
+VPATH = $(srcdir)
+
 LIBOBJECTS =   popt.o
 
-DEFCFLAGS=-O2 -Wall
+WARNINGS = -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes 
 
-SOURCES =$(subst .o,.c,$(LIBOBJECTS))
+SOURCES = $(addprefix $(srcdir)/,$(subst .o,.c,$(LIBOBJECTS)))
 LIBPOPT = libpopt.a
 LIBS=/usr/lib
 INCLUDE=/usr/include
 
-ifeq (../Makefile.inc,$(wildcard ../Makefile.inc))
-include ../Makefile.inc
-endif
-
 # -----------------------------------------------------------------------
 
-ifeq ($(CFLAGS),)
-CFLAGS=$(DEFCFLAGS)
-endif
+CFLAGS = @CFLAGS@ $(WARNINGS) $(OPTS)
 
 ifeq ($(RANLIB),)
 RANLIB=ranlib

diff --git a/popt/configure.in b/popt/configure.in
new file mode 100755 (executable)
index 0000000..0b61225
--- /dev/null
+++ b/popt/configure.in
@@ -0,0 +1,8 @@
+AC_INIT(popt.h)
+
+AC_PROG_CC
+AC_GCC_TRADITIONAL
+
+AC_CHECK_FUNCS(mmap)
+
+AC_OUTPUT(Makefile)

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 0e9276e..dd5bfba 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,7 +1,7 @@
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
-include $(srcdir)/../Makefile.inc
+include ../Makefile.inc
 
 PROGS = rpmlead rpmheader rpmarchive rpmsignature dump dumpdb
 LOADLIBES = @LIBS@ @LIBMISC@ @LIBINTL@