594dc20e48
Make sure only the external libpopt is used, instead of a mix between external and internal. from Brad with some tweaks
24 lines
1.3 KiB
Plaintext
24 lines
1.3 KiB
Plaintext
$OpenBSD: patch-lib_Makefile_in,v 1.1 2011/10/16 07:03:12 ajacoutot Exp $
|
|
--- lib/Makefile.in.orig Wed Sep 13 16:01:02 2000
|
|
+++ lib/Makefile.in Sun Oct 16 02:26:31 2011
|
|
@@ -159,7 +159,7 @@ varprefix = @varprefix@
|
|
|
|
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 = dbindex.h header.h misc.h rpmio.h rpmlib.h rpmmacro.h rpmurl.h stringbuf.h
|
|
@@ -167,8 +167,8 @@ pkginc_HEADERS = dbindex.h header.h misc.h rpmio.h r
|
|
noinst_HEADERS = cpio.h depends.h falloc.h fprint.h hash.h install.h lookup.h md5.h rpm_malloc.h rpmdb.h rpmlead.h signature.h
|
|
|
|
|
|
-mylibpaths = -L$(top_builddir)/lib -L$(top_builddir)/popt
|
|
-mylibs = -lrpm -lpopt @INTLLIBS@ @LIBMISC@
|
|
+mylibpaths = -L$(top_builddir)/lib @LDFLAGS@
|
|
+mylibs = -lrpm -lpopt -lintl -liconv @LIBMISC@
|
|
|
|
lib_LTLIBRARIES = librpm.la
|
|
librpm_la_SOURCES = cpio.c dbindex.c depends.c falloc.c formats.c fprint.c fs.c hash.c header.c install.c lookup.c macro.c md5.c md5sum.c messages.c misc.c package.c problems.c query.c rebuilddb.c rpmchecksig.c rpmdb.c rpmerr.c rpminstall.c rpmio.c rpmlead.c rpmlibprov.c rpmmalloc.c rpmrc.c signature.c stringbuf.c stubs.c tagName.c tagtable.c transaction.c uninstall.c url.c verify.c
|