Relocate XML schemas to share/xml/shibboleth

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index defebb0..db78557 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -3,6 +3,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE@
 
 lib_LTLIBRARIES = libshib-target.la
 
@@ -59,7 +60,8 @@ do_rpcgen:
 shib-paths.h: ${srcdir}/shib-paths.h.in Makefile ${top_builddir}/config.status
        rm -f $@.tmp
        sed < ${srcdir}/$@.in > $@.tmp \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:'
+           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:'
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp
 

diff --git a/shib-target/shib-paths.h.in b/shib-target/shib-paths.h.in
index 6a6bad0..772e1bb 100644 (file)
--- a/shib-target/shib-paths.h.in
+++ b/shib-target/shib-paths.h.in
@@ -62,7 +62,7 @@
 /*
  * SHIB_SCHEMAS defines the default location where the schemas will be installed.
  */
-#define SHIB_SCHEMAS "@-PKGSYSCONFDIR-@"
+#define SHIB_SCHEMAS "@-PKGXMLDIR-@"
 
 /*
  * SHIB_CONFIG defines the default location of the Shib Target Configuration File.

diff --git a/shib-target/shib-target.h b/shib-target/shib-target.h
index dc9969e..5a6b3fd 100644 (file)
--- a/shib-target/shib-target.h
+++ b/shib-target/shib-target.h
@@ -66,7 +66,7 @@
 # ifndef SHIBTARGET_EXPORTS
 #  define SHIBTARGET_EXPORTS __declspec(dllimport)
 # endif
-# define SHIB_SCHEMAS "/opt/shibboleth/etc/shibboleth"
+# define SHIB_SCHEMAS "/opt/shibboleth/share/xml/shibboleth"
 # define SHIB_CONFIG "/opt/shibboleth/etc/shibboleth/shibboleth.xml"
 #else
 # include <shib-target/shib-paths.h>