Rework decoder handling in simple resolver, add IdP/SP names to decoder API, hook...

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 5b4d216..f403a34 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,13 +2,16 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglogdir=${localstatedir}/log/@PACKAGE@
+pkglogdir = ${localstatedir}/log/@PACKAGE@
+shirelogdir = ${localstatedir}/log/httpd
 pkgxmldir = $(datadir)/xml/@PACKAGE@
+varrundir = $(localstatedir)/run
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 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
@@ -16,21 +19,23 @@ pkgsysconf_DATA = \
 # the config files will not overwrite existing versions.
 BUILTCONFIGFILES = \
        shibboleth.xml \
-       shire.logger \
-       shar.logger \
-       AAP.xml \
-       IQ-sites.xml \
-       IQ-trust.xml
+       native.logger \
+       shibd.logger \
+       resolver-simple.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 \
-       shar.key \
-       shar.crt
+       metadataError.html \
+       sslError.html \
+       sp-example.key \
+       sp-example.crt
 
 #
 # Some of these need building
@@ -42,7 +47,9 @@ do-build-file:
            -e 's:@-LIBEXECDIR-@:${libexecdir}:' \
            -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
            -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \
-           -e 's:@-PKGLOGDIR-@:${pkglogdir}:'
+           -e 's:@-PKGLOGDIR-@:${pkglogdir}:' \
+           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:' \
+           -e 's:@-VARRUNDIR-@:${varrundir}:'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -52,28 +59,33 @@ 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=$@
 
-shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status
+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=$@
 
-AAP.xml: ${srcdir}/AAP.xml.in Makefile ${top_builddir}/config.status
+shibboleth.xml: ${srcdir}/shibboleth.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
+resolver-simple.xml: ${srcdir}/resolver-simple.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)
@@ -93,26 +105,30 @@ 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
+       resolver-simple.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 \
-       shibboleth.logger \
+       apache22.config.in \
+       shibd.in \
+       console.logger \
+       syslog.logger \
        accessError.html \
        rmError.html \
        sessionError.html \
-       AAP.xml.in \
-       IQ-sites.xml.in \
-       IQ-trust.xml.in \
-       inqueue.pem \
-       shar.key \
-       shar.crt
+       metadataError.html \
+       sslError.html \
+       resolver-simple.xml.in \
+       example-metadata.xml.in \
+       sp-example.key \
+       sp-example.crt