48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From cac87554c89d55dd7c082ad4b234314e72d73a22 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 28 Jul 2017 15:16:17 -0400
|
|
Subject: [PATCH 1/4] Update pkgconfig directory
|
|
|
|
Patch by Robert Scheck <robert@fedoraproject.org> for popt <= 1.16 which changes
|
|
$(pkgconfigdir) on 64 bit systems from /usr/lib/pkgconfig to /usr/lib64/pkgconfig.
|
|
Using $(libdir)/pkgconfig rather $(prefix)/lib/pkgconfig seems to be common when
|
|
searching on the Internet. This patch however is not really compliant with Fedora
|
|
/%{_lib} vs. %{_libdir} handling before the UsrMove with Fedora 17. Alternatively
|
|
--with-pkgconfigdir or similar should be implemented.
|
|
|
|
This patch was proposed to upstream: http://rpm5.org/community/popt-devel/0265.html
|
|
---
|
|
Makefile.am | 2 +-
|
|
Makefile.in | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.am b/Makefile.am
|
|
index d7aec9e..8cc6220 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -47,7 +47,7 @@ usrlib_LTLIBRARIES = libpopt.la
|
|
libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
|
|
libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
|
|
|
|
-pkgconfigdir = $(prefix)/lib/pkgconfig
|
|
+pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = popt.pc
|
|
|
|
if HAVE_LD_VERSION_SCRIPT
|
|
diff --git a/Makefile.in b/Makefile.in
|
|
index 2e6890d..c331e20 100644
|
|
--- a/Makefile.in
|
|
+++ b/Makefile.in
|
|
@@ -370,7 +370,7 @@ usrlib_LTLIBRARIES = libpopt.la
|
|
libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
|
|
libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \
|
|
$(am__append_1)
|
|
-pkgconfigdir = $(prefix)/lib/pkgconfig
|
|
+pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = popt.pc
|
|
man_MANS = popt.3
|
|
BUILT_SOURCES = popt.pc # popt.lcd
|
|
--
|
|
2.13.3
|
|
|