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 3d3fc91..b5b92d8 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -8,8 +8,10 @@ pkgxmldir = $(datadir)/xml/@PACKAGE@
 varrundir = $(localstatedir)/run
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
+       shibd \
        apache.config \
        apache2.config \
+       apache22.config \
        inqueue.pem
 
 # The config files are installed "special".  Unlike the entries in
@@ -21,8 +23,8 @@ BUILTCONFIGFILES = \
        native.logger \
        shibd.logger \
        AAP.xml \
-       IQ-sites.xml \
-       IQ-trust.xml
+       IQ-metadata.xml \
+       example-metadata.xml
 
 # While BUILTCONFIGFILES are processed, these are not; so we should pull
 # them from SRCDIR.
@@ -32,8 +34,9 @@ CONFIGFILES = \
        rmError.html \
        sessionError.html \
        metadataError.html \
-       example.key \
-       example.crt
+       sslError.html \
+       sp-example.key \
+       sp-example.crt
 
 #
 # Some of these need building
@@ -57,6 +60,12 @@ 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=$@
+
 shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
@@ -69,10 +78,10 @@ shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.stat
 AAP.xml: ${srcdir}/AAP.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-IQ-sites.xml: ${srcdir}/IQ-sites.xml.in Makefile ${top_builddir}/config.status
+IQ-metadata.xml: ${srcdir}/IQ-metadata.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-IQ-trust.xml: ${srcdir}/IQ-trust.xml.in Makefile ${top_builddir}/config.status
+example-metadata.xml: ${srcdir}/example-metadata.xml.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 all-data-local: $(BUILTCONFIGFILES)
@@ -100,12 +109,14 @@ install-data-local:       all-data-local
 CLEANFILES = \
        apache.config \
        apache2.config \
+       apache22.config \
+       shibd \
        shibd.logger \
        native.logger \
        shibboleth.xml \
        AAP.xml \
-       IQ-sites.xml \
-       IQ-trust.xml
+       IQ-metadata.xml \
+       example-metadata.xml
 
 EXTRA_DIST = .cvsignore \
        shibboleth.xml.in \
@@ -113,14 +124,17 @@ 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-sites.xml.in \
-       IQ-trust.xml.in \
+       IQ-metadata.xml.in \
+       example-metadata.xml.in \
        inqueue.pem \
-       example.key \
-       example.crt
+       sp-example.key \
+       sp-example.crt