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 0a22e9f..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
@@ -18,11 +20,11 @@ pkgsysconf_DATA = \
 # the config files will not overwrite existing versions.
 BUILTCONFIGFILES = \
        shibboleth.xml \
-       shire.logger \
-       shar.logger \
+       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.
@@ -31,8 +33,10 @@ CONFIGFILES = \
        accessError.html \
        rmError.html \
        sessionError.html \
-       shar.key \
-       shar.crt
+       metadataError.html \
+       sslError.html \
+       sp-example.key \
+       sp-example.crt
 
 #
 # Some of these need building
@@ -56,10 +60,16 @@ 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=$@
 
-shar.logger: ${srcdir}/shar.logger.in Makefile ${top_builddir}/config.status
+apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
-shire.logger: ${srcdir}/shire.logger.in Makefile ${top_builddir}/config.status
+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=$@
+
+native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
 shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
@@ -68,16 +78,18 @@ 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)
 
 install-data-local:    all-data-local
        $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
+       $(mkinstalldirs) $(DESTDIR)$(shirelogdir)
+       $(mkinstalldirs) $(DESTDIR)$(varrundir)
        $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
        $(mkinstalldirs) $(DESTDIR)$(prefix)/data
        $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
@@ -97,26 +109,32 @@ install-data-local:        all-data-local
 CLEANFILES = \
        apache.config \
        apache2.config \
-       shar.logger \
-       shire.logger \
+       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 \
-       shire.logger.in \
-       shar.logger.in \
+       native.logger.in \
+       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 \
-       shar.key \
-       shar.crt
+       sp-example.key \
+       sp-example.crt