Unix installation fixes

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 2f3a184..b59f561 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -11,7 +11,7 @@ pkgsysconf_DATA = \
        shibd \
        apache.config \
        apache2.config \
-       inqueue.pem
+       apache22.config
 
 # The config files are installed "special".  Unlike the entries in
 # pkgsysconf_DATA, these files are installed as "foo.dist" and only
@@ -21,18 +21,20 @@ BUILTCONFIGFILES = \
        shibboleth.xml \
        native.logger \
        shibd.logger \
-       AAP.xml \
-       IQ-metadata.xml \
+       attribute-map.xml \
+       attribute-policy.xml \
        example-metadata.xml
 
 # While BUILTCONFIGFILES are processed, these are not; so we should pull
 # them from SRCDIR.
 CONFIGFILES = \
-       shibboleth.logger \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
        metadataError.html \
+       bindingTemplate.html \
        sslError.html \
        sp-example.key \
        sp-example.crt
@@ -43,13 +45,13 @@ CONFIGFILES = \
 do-build-file:
        rm -f ${FILE}.tmp
        sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-           -e 's:@-PREFIX-@:${prefix}:' \
-           -e 's:@-LIBEXECDIR-@:${libexecdir}:' \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
-           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \
-           -e 's:@-PKGLOGDIR-@:${pkglogdir}:' \
-           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:' \
-           -e 's:@-VARRUNDIR-@:${varrundir}:'
+           -e 's:@-PREFIX-@:${prefix}:g' \
+           -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
+           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+           -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
+           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
+           -e 's:@-VARRUNDIR-@:${varrundir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -59,6 +61,9 @@ apache.config: ${srcdir}/apache.config.in Makefile ${top_builddir}/config.status
 apache2.config: ${srcdir}/apache2.config.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
+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
        $(MAKE) do-build-file FILE=$@
 
@@ -71,10 +76,10 @@ native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
 shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-AAP.xml: ${srcdir}/AAP.xml.in Makefile ${top_builddir}/config.status
+attribute-map.xml: ${srcdir}/attribute-map.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-IQ-metadata.xml: ${srcdir}/IQ-metadata.xml.in Makefile ${top_builddir}/config.status
+attribute-policy.xml: ${srcdir}/attribute-policy.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 example-metadata.xml: ${srcdir}/example-metadata.xml.in Makefile ${top_builddir}/config.status
@@ -105,30 +110,32 @@ install-data-local:       all-data-local
 CLEANFILES = \
        apache.config \
        apache2.config \
+       apache22.config \
        shibd \
        shibd.logger \
        native.logger \
        shibboleth.xml \
-       AAP.xml \
-       IQ-metadata.xml \
+       attribute-map.xml \
+       attribute-policy.xml \
        example-metadata.xml
 
-EXTRA_DIST = .cvsignore \
+EXTRA_DIST = \
        shibboleth.xml.in \
+       attribute-map.xml.in \
+       attribute-policy.xml.in \
+       example-metadata.xml.in \
        native.logger.in \
        shibd.logger.in \
        apache.config.in \
        apache2.config.in \
+       apache22.config.in \
        shibd.in \
-       shibboleth.logger \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
        metadataError.html \
        sslError.html \
-       AAP.xml.in \
-       IQ-metadata.xml.in \
-       example-metadata.xml.in \
-       inqueue.pem \
        sp-example.key \
        sp-example.crt