SSPCPP-412 - systemd integration changes

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index cacbe1d..31154b1 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,22 +2,25 @@
 
 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@
-pkgcachedir = $(localstatedir)/cache/@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-systemd \
        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
@@ -67,7 +70,8 @@ do-build-file:
                -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
                -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
                -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-               -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
+               -e 's:@-PKGRUNDIR-@:${pkgrundir}:g' \
+               -e 's:@-PKGCACHEDIR-@:${pkgcachedir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -80,9 +84,18 @@ 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-systemd: ${srcdir}/shibd-systemd.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=$@
 
@@ -132,7 +145,10 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        apache22.config \
+       apache24.config \
+       shibd-systemd \
        shibd-redhat \
+       shibd-amazon \
        shibd-suse \
        shibd-debian \
        shibd-osx.plist \
@@ -145,13 +161,18 @@ EXTRA_DIST = \
        apache.config.in \
        apache2.config.in \
        apache22.config.in \
+       apache24.config.in \
+       shibd-systemd.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)