permit rpm to be built in a sub-directory (--srcdir=DIR).

CVS patchset: 2441
CVS date: 1998/10/11 15:19:55

19 files changed, 33 insertions, 52 deletions

diff --git a/CHANGES b/CHANGES
index eae285ffa..844638496 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,5 @@
 2.5.5 -> 2.90
+	- permit rpm to be built in a sub-directory (--srcdir=DIR).
 	- configure using automake.
 	- arch/os (and platform) should be case insensitive everywhere forever.
 	- attempt to deal rationally with os as "Linux" or "linux".
diff --git a/Makefile.am b/Makefile.am
index 3e887d176..952e6d755 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,9 @@ AUTOMAKE_OPTIONS = 1.3 foreign
 
 SUBDIRS = popt build lib po intl misc tools scripts
 
-INCLUDES = -I./build -I./lib -I./intl @INCPATH@
+INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@
 
-LDFLAGS = @LDFLAGS_STATIC@ -L./popt -L./build -L./lib -L./misc
+LDFLAGS = @LDFLAGS_STATIC@ -L$(top_builddir)/popt -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/misc
 
 rpmbindir = $(subst usr/bin,bin,$(bindir))
 rpmbin_PROGRAMS = rpm
@@ -30,12 +30,12 @@ rpm_SOURCES =		build.c checksig.c ftp.c install.c query.c rpm.c url.c \
 			verify.c
 rpm_LDADD =		-lrpmbuild -lpopt -lrpm @LIBMISC@
 
-rpm.o:
+rpm.o:	rpm.c
 	$(COMPILE) \
 		-DLOCALEDIR=\"$(LOCALEDIR)\" \
 		-DLIBRPMALIAS_FILENAME=\"$(LIBRPMALIAS_FILENAME)\" \
 		-DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
-		-c rpm.c
+		-c $<
 
 include ./Makefile.inc
 
diff --git a/Makefile.in b/Makefile.in
index 4c081e4c1..2caa3cac6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,17 +109,15 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 tmpdir = @tmpdir@
-topdir = @topdir@
-topsrcdir = @topsrcdir@
 varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
 SUBDIRS = popt build lib po intl misc tools scripts
 
-INCLUDES = -I./build -I./lib -I./intl @INCPATH@
+INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl @INCPATH@
 
-LDFLAGS = @LDFLAGS_STATIC@ -L./popt -L./build -L./lib -L./misc
+LDFLAGS = @LDFLAGS_STATIC@ -L$(top_builddir)/popt -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/misc
 
 rpmbindir = $(subst usr/bin,bin,$(bindir))
 rpmbin_PROGRAMS = rpm
@@ -679,12 +677,12 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
 
-rpm.o:
+rpm.o:	rpm.c
 	$(COMPILE) \
 		-DLOCALEDIR=\"$(LOCALEDIR)\" \
 		-DLIBRPMALIAS_FILENAME=\"$(LIBRPMALIAS_FILENAME)\" \
 		-DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
-		-c rpm.c
+		-c $<
 
 include ./Makefile.inc
 
diff --git a/Makefile.inc.in b/Makefile.inc.in
index 51e59a529..5043c838b 100644
--- a/Makefile.inc.in
+++ b/Makefile.inc.in
@@ -1,13 +1,12 @@
-topdir=@topdir@
-topsrcdir=@topsrcdir@
 CPP = @CPP@
 prefix= @prefix@
 exec_prefix = @exec_prefix@
 libdir= @libdir@
 
-AR = ar
+AR = @AR@
 RANLIB = @RANLIB@
 OPTS = @DEFS@
+
 RPMCONFIGDIR=@RPMCONFIGDIR@
 FINDPROVIDES=$(RPMCONFIGDIR)/find-provides
 FINDREQUIRES=$(RPMCONFIGDIR)/find-requires
@@ -19,8 +18,4 @@ LOCALEDIR=@datadir@/locale
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
-CFLAGS = -I$(topdir) -I$(topsrcdir) @CFLAGS@ @INCPATH@ $(OPTS) \
-	  -I$(topsrcdir)/lib -I$(topsrcdir)/misc
-LDFLAGS = @LDFLAGS@ -L$(topdir)/lib -L$(topdir)/build -L$(topdir)/misc \
-	  -L$(topdir)/popt
 CC = @CC@
diff --git a/build/Makefile.am b/build/Makefile.am
index d7106c22c..bf596b4f1 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I../lib @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib @INCPATH@
 
 include_HEADERS = rpmbuild.h rpmspec.h
 noinst_HEADERS = buildio.h myftw.h
diff --git a/build/Makefile.in b/build/Makefile.in
index 75d82150c..c0645fc01 100644
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -109,13 +109,11 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 tmpdir = @tmpdir@
-topdir = @topdir@
-topsrcdir = @topsrcdir@
 varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I../lib @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib @INCPATH@
 
 include_HEADERS = rpmbuild.h rpmspec.h
 noinst_HEADERS = buildio.h myftw.h
diff --git a/configure.in b/configure.in
index 51cac3e3b..d8b7cd3ae 100644
--- a/configure.in
+++ b/configure.in
@@ -188,7 +188,7 @@ if test "$cross_compiling" != "yes"; then
 	    AC_MSG_RESULT(no)
 	    AC_MSG_WARN(Can't find gzip, assuming $GZIPBIN)
     else
-	    AC_MSG_RESULT(yes)
+	    AC_MSG_RESULT($GZIPBIN)
     fi
 
     AC_MSG_CHECKING(for bzip2 location)
@@ -209,7 +209,7 @@ if test "$cross_compiling" != "yes"; then
 	    AC_MSG_RESULT(no)
 	    AC_MSG_WARN(Can't find bzip2, assuming $BZIP2BIN)
     else
-	    AC_MSG_RESULT(yes)
+	    AC_MSG_RESULT($BZIP2BIN)
     fi
 
     AC_MSG_CHECKING(old version of patch)
@@ -223,9 +223,6 @@ if test "$cross_compiling" != "yes"; then
     fi
 fi
 
-topdir=`pwd`
-topsrcdir=`cd ${srcdir}; pwd`
-
 addlib() {
   l=$1
   shift
@@ -591,8 +588,6 @@ AC_SUBST(INCPATH)
 
 AC_SUBST(varprefix)
 AC_SUBST(tmpdir)
-AC_SUBST(topdir)
-AC_SUBST(topsrcdir)
 
 AC_SUBST(LIBS)
 AC_SUBST(LIBDL)
diff --git a/ftp.c b/ftp.c
index 3f584cd2c..7b5805c4d 100644
--- a/ftp.c
+++ b/ftp.c
@@ -27,7 +27,9 @@ extern int h_errno;
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 
-#include "inet_aton.h"		/* for systems too stupid to provide this */
+#if !defined(HAVE_INET_ATON)
+int inet_aton(const char *cp, struct in_addr *inp);
+#endif
 
 #define TIMEOUT_SECS 60
 #define BUFFER_SIZE 4096
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f3d39d78c..d83fd4f4f 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I../build @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@
 
 rpmincdir = $(includedir)/rpm
 rpminc_HEADERS = dbindex.h header.h misc.h rpmlib.h rpmmacro.h stringbuf.h
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1fe51d626..34ba7818e 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -109,13 +109,11 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 tmpdir = @tmpdir@
-topdir = @topdir@
-topsrcdir = @topsrcdir@
 varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I../build @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@
 
 rpmincdir = $(includedir)/rpm
 rpminc_HEADERS = dbindex.h header.h misc.h rpmlib.h rpmmacro.h stringbuf.h
diff --git a/misc/Makefile.am b/misc/Makefile.am
index 04ff934b1..ee4e60333 100644
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
+INCLUDES = -I$(top_srcdir) @INCPATH@
+
 EXTRA_DIST = \
 	alloca.c	error.c		fakefork.c	fnmatch.c	\
 	getcwd.c	getmntent.c	getwd.c		glob.c		\
@@ -12,7 +14,7 @@ EXTRA_DIST = \
 	strtol.c	strtoul.c
 
 noinst_HEADERS = \
-	error.h		fnmatch.h	glob.h		inet_aton.h	\
+	error.h		fnmatch.h	glob.h				\
 	libgettext.h	message.h	po-lex.h	str-list.h	\
 	fstrcmp.h
 
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 042bd39e0..55fd0a7d8 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -109,12 +109,12 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 tmpdir = @tmpdir@
-topdir = @topdir@
-topsrcdir = @topsrcdir@
 varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
+INCLUDES = -I$(top_srcdir) @INCPATH@
+
 EXTRA_DIST = \
 	alloca.c	error.c		fakefork.c	fnmatch.c	\
 	getcwd.c	getmntent.c	getwd.c		glob.c		\
@@ -125,7 +125,7 @@ EXTRA_DIST = \
 	strtol.c	strtoul.c
 
 noinst_HEADERS = \
-	error.h		fnmatch.h	glob.h		inet_aton.h	\
+	error.h		fnmatch.h	glob.h				\
 	libgettext.h	message.h	po-lex.h	str-list.h	\
 	fstrcmp.h
 
diff --git a/misc/inet_aton.h b/misc/inet_aton.h
deleted file mode 100644
index fddbd1feb..000000000
--- a/misc/inet_aton.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef HAVE_INET_ATON
-
-int inet_aton(const char *cp, struct in_addr *inp);
-
-#endif
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index db56143a4..fb1a80bf7 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,4 +1,5 @@
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 VPATH = $(srcdir)
 
 include ../Makefile.inc
diff --git a/popt/Makefile.am b/popt/Makefile.am
index 4a93db4a5..bd1a4c814 100644
--- a/popt/Makefile.am
+++ b/popt/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I..
+INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
diff --git a/popt/Makefile.in b/popt/Makefile.in
index 6eb976c97..baadf0f94 100644
--- a/popt/Makefile.in
+++ b/popt/Makefile.in
@@ -70,7 +70,7 @@ VERSION = @VERSION@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I..
+INCLUDES = -I$(top_srcdir)
 
 noinst_HEADERS = popt.h
 noinst_LIBRARIES = libpopt.a
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 917f9e6c4..e5fccc91d 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -109,8 +109,6 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 tmpdir = @tmpdir@
-topdir = @topdir@
-topsrcdir = @topsrcdir@
 varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.2 foreign
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9cedc5476..5d2539bbb 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,9 +2,9 @@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I../build -I../lib -I../intl -I../misc @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/misc @INCPATH@
 
-LDFLAGS = -L../popt -L../build -L../lib -L../misc
+LDFLAGS = -L$(top_builddir)/popt -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/misc
 LDADD = -lrpm
 
 EXTRA_DIST =	fstrcmp.c message.c str-list.c
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 270468916..aad4eacee 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -109,15 +109,13 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 tmpdir = @tmpdir@
-topdir = @topdir@
-topsrcdir = @topsrcdir@
 varprefix = @varprefix@
 
 AUTOMAKE_OPTIONS = 1.3 foreign
 
-INCLUDES = -I../build -I../lib -I../intl -I../misc @INCPATH@
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/intl -I$(top_srcdir)/misc @INCPATH@
 
-LDFLAGS = -L../popt -L../build -L../lib -L../misc
+LDFLAGS = -L$(top_builddir)/popt -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/misc
 LDADD = -lrpm
 
 EXTRA_DIST =	fstrcmp.c message.c str-list.c