Relocate XML schemas to share/xml/shibboleth

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@1317 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/Makefile.am b/configs/Makefile.am
index a5bb90b..8b4f6ef 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,7 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-logdir=${localstatedir}/log/shibboleth
+pkglogdir=${localstatedir}/log/@PACKAGE@
+pkgxmldir = $(datadir)/xml/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
        apache.config \
@@ -36,7 +37,8 @@ do-build-file:
            -e 's:@-PREFIX-@:${prefix}:' \
            -e 's:@-LIBEXECDIR-@:${libexecdir}:' \
            -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
-           -e 's:@-LOGDIR-@:${logdir}:'
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \
+           -e 's:@-PKGLOGDIR-@:${pkglogdir}:'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -55,10 +57,20 @@ shire.logger: ${srcdir}/shire.logger.in Makefile ${top_builddir}/config.status
 shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
+AAP.xml: ${srcdir}/AAP.xml.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
+IQ-sites.xml: ${srcdir}/IQ-sites.xml.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
+IQ-trust.xml: ${srcdir}/IQ-trust.xml.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
 all-data-local: $(CONFIGFILES)
 
 install-data-local:    all-data-local
-       $(mkinstalldirs) $(DESTDIR)$(logdir)
+       $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
        $(mkinstalldirs) $(DESTDIR)$(prefix)/data
        $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
        for f in $(CONFIGFILES); do \
@@ -73,7 +85,10 @@ CLEANFILES = \
        apache2.config \
        shar.logger \
        shire.logger \
-       shibboleth.xml
+       shibboleth.xml \
+       AAP.xml \
+       IQ-sites.xml \
+       IQ-trust.xml
 
 EXTRA_DIST = .cvsignore \
        shibboleth.xml.in \
@@ -85,9 +100,9 @@ EXTRA_DIST = .cvsignore \
        accessError.html \
        rmError.html \
        shireError.html \
-       AAP.xml \
-       IQ-sites.xml \
-       IQ-trust.xml \
+       AAP.xml.in \
+       IQ-sites.xml.in \
+       IQ-trust.xml.in \
        inqueue.pem \
        shar.key \
        shar.crt

diff --git a/configs/apache.config.in b/configs/apache.config.in
index ba07a40..2a37d9d 100644 (file)
--- a/configs/apache.config.in
+++ b/configs/apache.config.in
@@ -14,7 +14,7 @@ LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_13.so
 # This is the XML file that contains all the global, non-apache-specific
 # configuration.  Look at this file for most of your configuration parameters.
 #
-ShibSchemaDir @-PKGSYSCONFDIR-@
+ShibSchemaDir @-PKGXMLDIR-@
 ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
 
 #

diff --git a/configs/apache2.config.in b/configs/apache2.config.in
index 8b9c025..cd1f49e 100644 (file)
--- a/configs/apache2.config.in
+++ b/configs/apache2.config.in
@@ -14,7 +14,7 @@ LoadModule mod_shib @-LIBEXECDIR-@/mod_shib_20.so
 # This is the XML file that contains all the global, non-apache-specific
 # configuration.  Look at this file for most of your configuration parameters.
 #
-ShibSchemaDir @-PKGSYSCONFDIR-@
+ShibSchemaDir @-PKGXMLDIR-@
 ShibConfig @-PKGSYSCONFDIR-@/shibboleth.xml
 
 #

diff --git a/configs/shar.logger.in b/configs/shar.logger.in
index 7692215..e3512a6 100644 (file)
--- a/configs/shar.logger.in
+++ b/configs/shar.logger.in
@@ -13,7 +13,7 @@ log4j.additivity.Shibboleth-TRANSACTION=false
 # define the appenders
 
 log4j.appender.shar_log=org.apache.log4j.RollingFileAppender
-log4j.appender.shar_log.fileName=@-LOGDIR-@/shar.log
+log4j.appender.shar_log.fileName=@-PKGLOGDIR-@/shar.log
 log4j.appender.shar_log.maxFileSize=1000000
 log4j.appender.shar_log.maxBackupIndex=10
 #log4j.appender.shar_log.layout=org.apache.log4j.BasicLayout
@@ -21,7 +21,7 @@ log4j.appender.shar_log.layout=org.apache.log4j.PatternLayout
 log4j.appender.shar_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
 
 log4j.appender.tran_log=org.apache.log4j.RollingFileAppender
-log4j.appender.tran_log.fileName=@-LOGDIR-@/transaction.log
+log4j.appender.tran_log.fileName=@-PKGLOGDIR-@/transaction.log
 log4j.appender.tran_log.maxFileSize=1000000
 log4j.appender.tran_log.maxBackupIndex=20
 log4j.appender.tran_log.layout=org.apache.log4j.PatternLayout

diff --git a/configs/shire.logger.in b/configs/shire.logger.in
index c52dac6..8f6af92 100644 (file)
--- a/configs/shire.logger.in
+++ b/configs/shire.logger.in
@@ -11,7 +11,7 @@ log4j.category.Shibboleth-TRANSACTION=WARN
 # define the appenders
 
 log4j.appender.shire_log=org.apache.log4j.RollingFileAppender
-log4j.appender.shire_log.fileName=@-LOGDIR-@/shire.log
+log4j.appender.shire_log.fileName=@-PKGLOGDIR-@/shire.log
 log4j.appender.shire_log.maxFileSize=1000000e
 log4j.appender.shire_log.maxBackupIndex=10
 #log4j.appender.shire_log.layout=org.apache.log4j.BasicLayout

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 4030333..0f79652 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -2,8 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
-pkgsysconf_DATA = \
+pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgxml_DATA = \
                 credentials.xsd \
                 cs-sstc-schema-assertion-01.xsd \
                 cs-sstc-schema-protocol-01.xsd \
@@ -19,4 +19,4 @@ pkgsysconf_DATA = \
                 shibboleth-targetconfig-1.0.xsd \
                                sstc-saml-schema-assertion-2.0.xsd \
                                sstc-saml-schema-metadata-2.0.xsd
-                               
\ No newline at end of file
+               
\ No newline at end of file