594dc20e48
Make sure only the external libpopt is used, instead of a mix between external and internal. from Brad with some tweaks
44 lines
1.8 KiB
Plaintext
44 lines
1.8 KiB
Plaintext
$OpenBSD: patch-Makefile_in,v 1.4 2011/10/16 07:03:12 ajacoutot Exp $
|
|
--- Makefile.in.orig Wed Sep 13 16:00:40 2000
|
|
+++ Makefile.in Sun Oct 16 02:26:04 2011
|
|
@@ -162,19 +162,19 @@ EXTRA_DIST = CHANGES CREDITS GROUPS README.amiga INSTA
|
|
|
|
|
|
# XXX TODO: python perl
|
|
-SUBDIRS = intl po popt lib build misc tools scripts tests doc .
|
|
+SUBDIRS = po lib build misc tools scripts tests doc .
|
|
|
|
-INCLUDES = -I$(top_srcdir)/build -I$(top_srcdir)/lib -I$(top_srcdir)/popt @INCPATH@
|
|
+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 @INTLLIBS@ @LIBMISC@
|
|
+myldadd = $(top_builddir)/build/.libs/librpmbuild.a $(top_builddir)/lib/.libs/librpm.a -lpopt -lintl -liconv @LIBMISC@
|
|
|
|
|
|
-LDFLAGS = @LDFLAGS_STATIC@ $(myldflags)
|
|
+LDFLAGS = @LDFLAGS@ $(myldflags)
|
|
LDADD = $(myldadd)
|
|
|
|
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`
|
|
@@ -208,12 +208,12 @@ CPPFLAGS = @CPPFLAGS@
|
|
rpm2cpio_OBJECTS = rpm2cpio.o
|
|
rpm2cpio_LDADD = $(LDADD)
|
|
rpm2cpio_DEPENDENCIES = $(top_builddir)/build/.libs/librpmbuild.a \
|
|
-$(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a
|
|
+$(top_builddir)/lib/.libs/librpm.a
|
|
rpm2cpio_LDFLAGS =
|
|
rpm_OBJECTS = build.o rpm.o
|
|
rpm_LDADD = $(LDADD)
|
|
rpm_DEPENDENCIES = $(top_builddir)/build/.libs/librpmbuild.a \
|
|
-$(top_builddir)/lib/.libs/librpm.a $(top_builddir)/popt/.libs/libpopt.a
|
|
+$(top_builddir)/lib/.libs/librpm.a
|
|
rpm_LDFLAGS =
|
|
SCRIPTS = $(bin_SCRIPTS) $(pkglib_SCRIPTS)
|
|
|