diff options
Diffstat (limited to 'archivers/rpm5/files/patch-Makefile.in')
-rw-r--r-- | archivers/rpm5/files/patch-Makefile.in | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/archivers/rpm5/files/patch-Makefile.in b/archivers/rpm5/files/patch-Makefile.in deleted file mode 100644 index 5a1a4ce6d989..000000000000 --- a/archivers/rpm5/files/patch-Makefile.in +++ /dev/null @@ -1,99 +0,0 @@ ---- Makefile.in.orig Thu Feb 14 16:58:07 2002 -+++ Makefile.in Thu Mar 4 11:29:06 2004 -@@ -195,7 +195,7 @@ - rpm.magic rpmpopt-$(VERSION) rpmqv.c rpm.c - - --SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ popt beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . -+SUBDIRS = intl po @WITH_ZLIB_SUBDIR@ @WITH_DB_SUBDIR@ beecrypt rpmio rpmdb lib build misc @WITH_PYTHON_SUBDIR@ tools scripts tests doc . - - INCLUDES = \ - -I$(top_srcdir)/build \ -@@ -203,12 +203,14 @@ - -I$(top_srcdir)/rpmdb \ - -I$(top_srcdir)/rpmio \ - -I$(top_srcdir)/beecrypt \ -- -I$(top_srcdir)/popt \ - @WITH_ZLIB_INCLUDE@ \ -+ @WITH_POPT_INCLUDE@ \ - @INCPATH@ - - --LIBS = -lrt -lpthread -+LIBS = @WITH_POPT_LIB@ \ -+ @WITH_ZLIB_LIB@ \ -+ @INTLLIBS@ - - myLDFLAGS = @LDFLAGS_STATIC@ - -@@ -220,9 +222,7 @@ - $(top_builddir)/lib/librpm.la \ - $(top_builddir)/rpmdb/librpmdb.la \ - $(top_builddir)/rpmio/librpmio.la \ -- $(top_builddir)/popt/libpopt.la \ -- @WITH_ZLIB_LIB@ \ -- @INTLLIBS@ @LIBMISC@ -+ @LIBMISC@ - - - rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,` -@@ -294,31 +294,31 @@ - rpm2cpio_OBJECTS = rpm2cpio.$(OBJEXT) - rpm2cpio_DEPENDENCIES = $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - rpmb_OBJECTS = build.$(OBJEXT) - rpmb_DEPENDENCIES = rpmb.o $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - rpmd_OBJECTS = - rpmd_DEPENDENCIES = rpmd.o $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - rpmi_OBJECTS = - rpmi_DEPENDENCIES = rpmi.o $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - rpmk_OBJECTS = - rpmk_DEPENDENCIES = rpmk.o $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - rpmq_OBJECTS = - rpmq_DEPENDENCIES = rpmq.o $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - rpm_OBJECTS = - rpm_DEPENDENCIES = rpm.o $(top_builddir)/build/librpmbuild.la \ - $(top_builddir)/lib/librpm.la $(top_builddir)/rpmdb/librpmdb.la \ --$(top_builddir)/rpmio/librpmio.la $(top_builddir)/popt/libpopt.la -+$(top_builddir)/rpmio/librpmio.la - SCRIPTS = $(bin_SCRIPTS) $(pkglib_SCRIPTS) - - CFLAGS = @CFLAGS@ -@@ -887,11 +887,9 @@ - `make -s sources -C lib` \ - `make -s sources -C rpmdb` \ - `make -s sources -C rpmio` \ -- `make -s sources -C beecrypt` \ -- `make -s sources -C popt` -+ `make -s sources -C beecrypt` - - install-data-local: -- @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm - @rm -f $(DESTDIR)$(libdir)/rpmrc - @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc - @rm -f $(DESTDIR)$(libdir)/rpmpopt -@@ -946,7 +944,6 @@ - solaris*|linux*) \ - chmod u+x ./installplatform; DESTDIR="$(DESTDIR)" pkglibdir="$(pkglibdir)" ./installplatform rpmrc macros platform ;; \ - esac -- @$(mkinstalldirs) $(DESTDIR)/var/tmp - - .PHONY: setperms - setperms: |