Merge commit '2.5.0' into moonshot-packaging-fixes

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 5224c4e..30d2fc6 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,13 +2,14 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglibdir = ${libdir}/@PACKAGE@
-pkglogdir = ${localstatedir}/log/@PACKAGE@
+pkglibdir = ${libdir}/@PACKAGE_NAME@
+pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
 shirelogdir = ${localstatedir}/log/httpd
-pkgxmldir = $(datadir)/xml/@PACKAGE@
-pkgwebdir = $(datadir)/@PACKAGE@
-pkgrundir = $(localstatedir)/run/@PACKAGE@
-pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+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-suse \
@@ -42,6 +43,7 @@ CONFIGFILES = \
        console.logger \
        syslog.logger \
        accessError.html \
+       attrChecker.html \
        sessionError.html \
        metadataError.html \
        bindingTemplate.html \
@@ -58,14 +60,14 @@ 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'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -78,6 +80,9 @@ 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=$@
 
@@ -102,6 +107,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 \
@@ -129,6 +135,7 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        apache22.config \
+       apache24.config \
        shibd-redhat \
        shibd-suse \
        shibd-debian \
@@ -142,6 +149,7 @@ EXTRA_DIST = \
        apache.config.in \
        apache2.config.in \
        apache22.config.in \
+       apache24.config.in \
        shibd-redhat.in \
        shibd-suse.in \
        shibd-debian.in \
@@ -149,6 +157,8 @@ EXTRA_DIST = \
        keygen.bat \
        keygen.sh \
        metagen.sh \
+       SetService32.bat \
+       SetService64.bat \
        upgrade.xsl \
        xsltproc.js \
        $(CONFIGFILES)