Merge up some more Apache 2.2 changes.

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 37e1970..b5b92d8 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -11,6 +11,7 @@ pkgsysconf_DATA = \
        shibd \
        apache.config \
        apache2.config \
+       apache22.config \
        inqueue.pem
 
 # The config files are installed "special".  Unlike the entries in
@@ -33,6 +34,7 @@ CONFIGFILES = \
        rmError.html \
        sessionError.html \
        metadataError.html \
+       sslError.html \
        sp-example.key \
        sp-example.crt
 
@@ -58,6 +60,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=$@
 
@@ -104,6 +109,7 @@ install-data-local: all-data-local
 CLEANFILES = \
        apache.config \
        apache2.config \
+       apache22.config \
        shibd \
        shibd.logger \
        native.logger \
@@ -118,12 +124,14 @@ EXTRA_DIST = .cvsignore \
        shibd.logger.in \
        apache.config.in \
        apache2.config.in \
+       apache22.config.in \
        shibd.in \
        shibboleth.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
        metadataError.html \
+       sslError.html \
        AAP.xml.in \
        IQ-metadata.xml.in \
        example-metadata.xml.in \