[xmltooling] 02/04: New patch Remove-PKG_INSTALLDIR-to-build-with-older-pkg-config.patch

[Etienne Dysli Metref]

This is an automated email from the git hooks/post-receive script.

edm-guest pushed a commit to branch debian/wheezy-backports-sloppy
in repository xmltooling.

commit 9109b5b9c9d0d1aa43a8d9479a377a340b717ace
Author: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
Date:   Wed Sep 21 09:34:24 2016 +0200

    New patch Remove-PKG_INSTALLDIR-to-build-with-older-pkg-config.patch
    
    Remove PKG_INSTALLDIR from configure.ac because pkg-config < 0.27 does
    not have this macro.
---
 ...INSTALLDIR-to-build-with-older-pkg-config.patch | 38 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/Remove-PKG_INSTALLDIR-to-build-with-older-pkg-config.patch b/debian/patches/Remove-PKG_INSTALLDIR-to-build-with-older-pkg-config.patch
new file mode 100644
index 0000000..2a883c2
--- /dev/null
+++ b/debian/patches/Remove-PKG_INSTALLDIR-to-build-with-older-pkg-config.patch
@@ -0,0 +1,38 @@
+From: Etienne Dysli Metref <etienne.dysli-metref at switch.ch>
+Date: Wed, 21 Sep 2016 09:29:21 +0200
+Subject: Remove PKG_INSTALLDIR to build with older pkg-config
+
+pkg-config < 0.27 does not have the PKG_INSTALLDIR macro.
+Re-added pkgconfigdir to the Makefile by reverting patch "Make
+pkgconfigdir configurable".
+
+This reverts commit 5e2abcae6b9b32c562028d1d31a3f28748dd5131.
+---
+ Makefile.am  | 1 +
+ configure.ac | 1 -
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 8be5fd5..9d14433 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,6 +17,7 @@ else
+ all-local:
+ endif
+ 
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = @PACKAGE_NAME at .pc @PACKAGE_NAME at -lite.pc
+ 
+ GENFILES = @PACKAGE_NAME at .spec
+diff --git a/configure.ac b/configure.ac
+index 2f61eff..6ab6dcc 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,6 @@ AC_CONFIG_MACRO_DIR(m4)
+ AM_INIT_AUTOMAKE
+ AC_DISABLE_STATIC
+ AC_PROG_LIBTOOL
+-PKG_INSTALLDIR
+ 
+ # Docygen features
+ DX_HTML_FEATURE(ON)
diff --git a/debian/patches/series b/debian/patches/series
index 4cf3781..d03b947 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ Only-add-found-packages-to-the-pkg-config-dependenci.patch
 Add-separate-pkg-config-file-for-xmltooling-lite.patch
 Enable-skipping-tests-which-require-network-access.patch
 Enable-the-dot-feature-of-Doxygen.patch
+Remove-PKG_INSTALLDIR-to-build-with-older-pkg-config.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git