[xmltooling] 08/19: Make pkgxmldir configurable

Ferenc Wágner wferi-guest at moszumanska.debian.org
Thu Jul 21 18:18:59 UTC 2016


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

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

commit 30459b72e50483620e62a62e14bf1cb602639648
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Tue Jul 5 13:45:57 2016 +0200

    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

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



More information about the Pkg-shibboleth-devel mailing list