Rework XML directory substitutions to handle xmltooling/opensaml in alternate locations.

[shibboleth/sp.git] / configs / Makefile.am

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 845b0d5..fb64f30 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,14 +2,17 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+pkglibdir = ${libdir}/@PACKAGE@
 pkglogdir = ${localstatedir}/log/@PACKAGE@
+pkgdocdir = ${datadir}/doc/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
-xmldir = $(datadir)/xml
 pkgxmldir = $(datadir)/xml/@PACKAGE@
-varrundir = $(localstatedir)/run
+pkgrundir = $(localstatedir)/run/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
-       shibd \
+       shibd-redhat \
+       shibd-debian \
+       shibd-osx.plist \
        apache.config \
        apache2.config \
        apache22.config
@@ -35,6 +38,8 @@ CONFIGFILES = \
        sessionError.html \
        metadataError.html \
        bindingTemplate.html \
+       localLogout.html \
+       globalLogout.html \
        sslError.html \
        sp-example.key \
        sp-example.crt
@@ -45,14 +50,16 @@ CONFIGFILES = \
 do-build-file:
        rm -f ${FILE}.tmp
        sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-           -e 's:@-PREFIX-@:${prefix}:g' \
-           -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
-            -e 's:@-XMLDIR-@:${xmldir}:g' \
-           -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
-           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-           -e 's:@-VARRUNDIR-@:${varrundir}:g'
+        -e 's:@-PREFIX-@:${prefix}:g' \
+        -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
+        -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+        -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
+        -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g'
+        -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g'
+        -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g'
+        -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
+        -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
+        -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -65,7 +72,13 @@ apache2.config: ${srcdir}/apache2.config.in Makefile ${top_builddir}/config.stat
 apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-shibd: ${srcdir}/shibd.in Makefile ${top_builddir}/config.status
+shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
+shibd-debian: ${srcdir}/shibd-debian.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
+shibd-osx.plist: ${srcdir}/shibd-osx.plist.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
@@ -90,10 +103,10 @@ all-data-local: $(BUILTCONFIGFILES)
 
 install-data-local:    all-data-local
        $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
        $(mkinstalldirs) $(DESTDIR)$(shirelogdir)
-       $(mkinstalldirs) $(DESTDIR)$(varrundir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgrundir)
        $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
-       $(mkinstalldirs) $(DESTDIR)$(prefix)/data
        $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
        for f in $(BUILTCONFIGFILES); do \
                if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \
@@ -112,7 +125,9 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        apache22.config \
-       shibd \
+       shibd-redhat \
+       shibd-debian \
+       shibd-osx.plist \
        shibd.logger \
        native.logger \
        shibboleth2.xml \
@@ -130,13 +145,7 @@ EXTRA_DIST = \
        apache.config.in \
        apache2.config.in \
        apache22.config.in \
-       shibd.in \
-       console.logger \
-       syslog.logger \
-       bindingTemplate.html \
-       accessError.html \
-       sessionError.html \
-       metadataError.html \
-       sslError.html \
-       sp-example.key \
-       sp-example.crt
+       shibd-redhat.in \
+       shibd-debian.in \
+       shibd-osx.plist.in \
+       $(CONFIGFILES)