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

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index cacbe1d..3b52b40 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,14 +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@
-pkgcachedir = $(localstatedir)/cache/@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 \
@@ -18,6 +18,7 @@ pkgsysconf_DATA = \
        apache.config \
        apache2.config \
        apache22.config \
+       apache24.config \
        keygen.sh \
        metagen.sh \
        upgrade.xsl
@@ -80,6 +81,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=$@
 
@@ -132,6 +136,7 @@ CLEANFILES = \
        apache.config \
        apache2.config \
        apache22.config \
+       apache24.config \
        shibd-redhat \
        shibd-suse \
        shibd-debian \
@@ -145,6 +150,7 @@ EXTRA_DIST = \
        apache.config.in \
        apache2.config.in \
        apache22.config.in \
+       apache24.config.in \
        shibd-redhat.in \
        shibd-suse.in \
        shibd-debian.in \
@@ -152,6 +158,8 @@ EXTRA_DIST = \
        keygen.bat \
        keygen.sh \
        metagen.sh \
+       SetService32.bat \
+       SetService64.bat \
        upgrade.xsl \
        xsltproc.js \
        $(CONFIGFILES)