4 files changed, 81 insertions, 0 deletions
diff --git a/misc/rpm/files/patch-bd b/misc/rpm/files/patch-bd
new file mode 100644
index 000000000000..5d3992602259
--- /dev/null
+++ b/misc/rpm/files/patch-bd
@@ -0,0 +1,26 @@
+--- Makefile.am.orig	Thu Sep 14 02:36:40 2000
++++ Makefile.am	Wed Oct  4 06:08:38 2000
+@@ -11,19 +11,19 @@
+ 	rpm.magic rpmpopt rpm.spec installplatform
+ 
+ # XXX TODO: python perl
+-SUBDIRS = intl po popt lib build misc tools scripts tests doc .
++SUBDIRS = intl po lib build misc tools scripts tests .
+ 
+-INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
++INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib \
+ 	@INCPATH@
+ 
+-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
++myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib
+ 
+ # XXX libtool can/should generate dependent libs.
+ # XXX solaris2.6 cannot use *.la with --all-static (downrev binutils/egcs?)
+ myldadd= \
+ 	$(top_builddir)/build/.libs/librpmbuild.a \
+ 	$(top_builddir)/lib/.libs/librpm.a \
+-	$(top_builddir)/popt/.libs/libpopt.a \
++	-lpopt \
+ 	@INTLLIBS@ @LIBMISC@
+ 
+ LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
diff --git a/misc/rpm/files/patch-be b/misc/rpm/files/patch-be
new file mode 100644
index 000000000000..5c34517e9088
--- /dev/null
+++ b/misc/rpm/files/patch-be
@@ -0,0 +1,11 @@
+--- build/Makefile.am.orig	Wed Jun 14 21:34:28 2000
++++ build/Makefile.am	Wed Oct  4 05:02:45 2000
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/popt \
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib \
+ 	@INCPATH@
+ 
+ pkgincdir = $(pkgincludedir)
diff --git a/misc/rpm/files/patch-bf b/misc/rpm/files/patch-bf
new file mode 100644
index 000000000000..e7fa9954a817
--- /dev/null
+++ b/misc/rpm/files/patch-bf
@@ -0,0 +1,20 @@
+--- lib/Makefile.am.orig	Mon Jul 17 03:49:43 2000
++++ lib/Makefile.am	Wed Oct  4 05:32:09 2000
+@@ -2,7 +2,7 @@
+ 
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build -I$(top_srcdir)/popt @INCPATH@
++INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build @INCPATH@
+ 
+ pkgincdir = $(pkgincludedir)
+ pkginc_HEADERS = \
+@@ -12,7 +12,7 @@
+ 	lookup.h md5.h rpm_malloc.h \
+ 	rpmdb.h rpmlead.h signature.h
+ 
+-mylibpaths= -L$(top_builddir)/lib -L$(top_builddir)/popt
++mylibpaths= -L$(top_builddir)/lib
+ mylibs=	-lrpm -lpopt @INTLLIBS@ @LIBMISC@
+ 
+ lib_LTLIBRARIES = librpm.la
diff --git a/misc/rpm/files/patch-bg b/misc/rpm/files/patch-bg
new file mode 100644
index 000000000000..c3968cf1ce7f
--- /dev/null
+++ b/misc/rpm/files/patch-bg
@@ -0,0 +1,24 @@
+--- tools/Makefile.am.orig	Wed Jun 14 21:34:51 2000
++++ tools/Makefile.am	Wed Oct  4 05:34:26 2000
+@@ -3,18 +3,18 @@
+ AUTOMAKE_OPTIONS = 1.4 foreign
+ 
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/build \
+-	-I$(top_srcdir)/lib -I$(top_srcdir)/popt \
++	-I$(top_srcdir)/lib \
+ 	@INCPATH@ -I$(top_srcdir)/misc
+ 
+ EXTRA_DIST =	fstrcmp.c message.c str-list.c rpmchecksig.c
+ 
+ EXTRA_PROGRAMS = rpmgettext rpmputtext rpminject
+ 
+-myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib -L$(top_builddir)/popt
++myldflags= -L$(top_builddir)/build -L$(top_builddir)/lib
+ # XXX should libtool generate dependent libs?
+ myldadd= $(top_builddir)/build/librpmbuild.la \
+ 	$(top_builddir)/lib/librpm.la \
+-	$(top_builddir)/popt/libpopt.la \
++	-lpopt \
+ 	@INTLLIBS@ @LIBMISC@
+ 
+ LDFLAGS = $(myldflags)