[xmltooling] 06/17: New patch Make-pkgxmldir-configurable.patch

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch debian/experimental
in repository xmltooling.

commit c0c0aab261bfede053373f4ebf2a3288e63fe613
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Tue Jul 5 13:48:03 2016 +0200

    New patch Make-pkgxmldir-configurable.patch
    
    Make pkgxmldir configurable
---
 debian/patches/Make-pkgxmldir-configurable.patch | 52 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 2 files changed, 53 insertions(+)

diff --git a/debian/patches/Make-pkgxmldir-configurable.patch b/debian/patches/Make-pkgxmldir-configurable.patch
new file mode 100644
index 0000000..1cc8b81
--- /dev/null
+++ b/debian/patches/Make-pkgxmldir-configurable.patch
@@ -0,0 +1,52 @@
+From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi at niif.hu>
+Date: Tue, 5 Jul 2016 13:45:57 +0200
+Subject: Make pkgxmldir configurable
+
+---
+ configure.ac        | 6 ++++++
+ schemas/Makefile.am | 2 --
+ xmltooling.pc.in    | 2 ++
+ 3 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0050d2c..78f6d72 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],
++        [where to install the schema files @<:@default=${datadir}/xml/AC_PACKAGE_TARNAME@:>@])],
++    [],[with_xmldir=${datadir}/xml/AC_PACKAGE_TARNAME])
++AC_SUBST([pkgxmldir],[${with_xmldir}])
++
+ # output packaging and makefiles
+ AC_OUTPUT
+diff --git a/schemas/Makefile.am b/schemas/Makefile.am
+index ee11aac..3b9c00c 100644
+--- a/schemas/Makefile.am
++++ b/schemas/Makefile.am
+@@ -9,8 +9,6 @@ schemafiles = \
+ 	xml.xsd \
+ 	xmltooling.xsd
+ 
+-pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
+-
+ pkgxml_DATA = \
+ 	catalog.xml \
+ 	$(schemafiles)
+diff --git a/xmltooling.pc.in b/xmltooling.pc.in
+index e5dd983..0f58c6c 100644
+--- a/xmltooling.pc.in
++++ b/xmltooling.pc.in
+@@ -2,6 +2,8 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
++datarootdir=@datarootdir@
++xmldir=@pkgxmldir@
+ 
+ Name: @PACKAGE_NAME@
+ Description: OpenSAML XMLTooling-C library
diff --git a/debian/patches/series b/debian/patches/series
index 624a2ce..9d15315 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Discover-xerces-xmlsec-openssl-and-curl-via-pkg-conf.patch
 Propagate-requirements-into-our-pkg-config-file.patch
 Make-pkgconfigdir-configurable.patch
 Print-result-of-CURLINFO_TLS_SSL_PTR-test.patch
+Make-pkgxmldir-configurable.patch

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