[xmltooling] 01/03: Export pkgxmldir (the correct name) via pkg-config

[Ferenc Wágner]

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

wferi pushed a commit to branch debian/master
in repository xmltooling.

commit 6b1e6e20d1fb6bc2c2cb2aaf7a746e3af4153c28
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Sep 7 10:26:06 2016 +0200

    Export pkgxmldir (the correct name) via pkg-config
    
    And call it pkgxmldir instead of xmldir in the configure script.
    
    Closes: #836898
---
 debian/patches/Make-pkgxmldir-configurable.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/Make-pkgxmldir-configurable.patch b/debian/patches/Make-pkgxmldir-configurable.patch
index 1cc8b81..fe98b97 100644
--- a/debian/patches/Make-pkgxmldir-configurable.patch
+++ b/debian/patches/Make-pkgxmldir-configurable.patch
@@ -9,18 +9,18 @@ Subject: Make pkgxmldir configurable
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0050d2c..78f6d72 100644
+index 0050d2c..05ed466 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -274,5 +274,11 @@ AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST})
  dnl Disabled on Debian since build log analysis wants verbose logs.
  dnl LIBTOOL="$LIBTOOL --silent"
  
-+AC_ARG_WITH([xmldir],
-+    AS_HELP_STRING([--with-xmldir=DIR],
++AC_ARG_WITH([pkgxmldir],
++    AS_HELP_STRING([--with-pkgxmldir=DIR],
 +        [where to install the schema files @<:@default=${datadir}/xml/AC_PACKAGE_TARNAME@:>@])],
-+    [],[with_xmldir=${datadir}/xml/AC_PACKAGE_TARNAME])
-+AC_SUBST([pkgxmldir],[${with_xmldir}])
++    [],[with_pkgxmldir=${datadir}/xml/AC_PACKAGE_TARNAME])
++AC_SUBST([pkgxmldir],[${with_pkgxmldir}])
 +
  # output packaging and makefiles
  AC_OUTPUT
@@ -38,7 +38,7 @@ index ee11aac..3b9c00c 100644
  	catalog.xml \
  	$(schemafiles)
 diff --git a/xmltooling.pc.in b/xmltooling.pc.in
-index e5dd983..0f58c6c 100644
+index e5dd983..a289acd 100644
 --- a/xmltooling.pc.in
 +++ b/xmltooling.pc.in
 @@ -2,6 +2,8 @@ prefix=@prefix@
@@ -46,7 +46,7 @@ index e5dd983..0f58c6c 100644
  libdir=@libdir@
  includedir=@includedir@
 +datarootdir=@datarootdir@
-+xmldir=@pkgxmldir@
++pkgxmldir=@pkgxmldir@
  
  Name: @PACKAGE_NAME@
  Description: OpenSAML XMLTooling-C library

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