https://issues.shibboleth.net/jira/browse/SSPCPP-645

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 8028341..810057c 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,21 +2,24 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglibdir = ${libdir}/@PACKAGE@
-pkglogdir = ${localstatedir}/log/@PACKAGE@
-shirelogdir = ${localstatedir}/log/httpd
-pkgxmldir = $(datadir)/xml/@PACKAGE@
-pkgwebdir = $(datadir)/@PACKAGE@
-pkgrundir = $(localstatedir)/run/@PACKAGE@
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+pkglibdir = ${libdir}/@PACKAGE_NAME@
+pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
+shirelogdir = ${localstatedir}/log/@PACKAGE_NAME@-www
+pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
+pkgwebdir = $(datadir)/@PACKAGE_NAME@
+pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
+pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
+pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
 pkgsysconf_DATA = \
        shibd-redhat \
+    shibd-amazon \
        shibd-suse \
        shibd-debian \
        shibd-osx.plist \
        apache.config \
        apache2.config \
        apache22.config \
+       apache24.config \
        keygen.sh \
        metagen.sh \
        upgrade.xsl
@@ -42,7 +45,7 @@ CONFIGFILES = \
        console.logger \
        syslog.logger \
        accessError.html \
-    attrChecker.html \
+       attrChecker.html \
        sessionError.html \
        metadataError.html \
        bindingTemplate.html \
@@ -59,14 +62,15 @@ CONFIGFILES = \
 do-build-file:
        rm -f ${FILE}.tmp
        sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-        -e 's:@-PREFIX-@:${prefix}:g' \
-        -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
-        -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-        -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
-        -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
-        -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
-        -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-        -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
+               -e 's:@-PREFIX-@:${prefix}:g' \
+               -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
+               -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+               -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+               -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
+               -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
+               -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
+               -e 's:@-PKGRUNDIR-@:${pkgrundir}:g' \
+               -e 's:@-PKGCACHEDIR-@:${pkgcachedir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -79,9 +83,15 @@ 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=$@
 
+apache24.config: ${srcdir}/apache24.config.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
 shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
+shibd-amazon: ${srcdir}/shibd-amazon.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
 shibd-suse: ${srcdir}/shibd-suse.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
@@ -103,6 +113,7 @@ install-data-local: all-data-local
        $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
        $(mkinstalldirs) $(DESTDIR)$(shirelogdir)
        $(mkinstalldirs) $(DESTDIR)$(pkgrundir)
+       $(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
        $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
        $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
        for f in $(BUILTCONFIGFILES); do \
@@ -130,7 +141,9 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        apache22.config \
+       apache24.config \
        shibd-redhat \
+    shibd-amazon \
        shibd-suse \
        shibd-debian \
        shibd-osx.plist \
@@ -143,13 +156,17 @@ EXTRA_DIST = \
        apache.config.in \
        apache2.config.in \
        apache22.config.in \
+       apache24.config.in \
        shibd-redhat.in \
+    shibd-amazon.in \
        shibd-suse.in \
        shibd-debian.in \
        shibd-osx.plist.in \
        keygen.bat \
        keygen.sh \
        metagen.sh \
+       SetService32.bat \
+       SetService64.bat \
        upgrade.xsl \
        xsltproc.js \
        $(CONFIGFILES)