https://issues.shibboleth.net/jira/browse/SSPCPP-411

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

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 8b17cae..6ebd212 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -4,19 +4,23 @@ AUTOMAKE_OPTIONS = foreign
 
 pkglibdir = ${libdir}/@PACKAGE@
 pkglogdir = ${localstatedir}/log/@PACKAGE@
-pkgdocdir = ${datadir}/doc/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
 pkgxmldir = $(datadir)/xml/@PACKAGE@
+pkgwebdir = $(datadir)/@PACKAGE@
 pkgrundir = $(localstatedir)/run/@PACKAGE@
+pkgcachedir = $(localstatedir)/cache/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
        shibd-redhat \
+       shibd-suse \
        shibd-debian \
        shibd-osx.plist \
        apache.config \
        apache2.config \
        apache22.config \
-       keygen.sh
+       keygen.sh \
+       metagen.sh \
+       upgrade.xsl
 
 # The config files are installed "special".  Unlike the entries in
 # pkgsysconf_DATA, these files are installed as "foo.dist" and only
@@ -32,15 +36,22 @@ CONFIGFILES = \
        shibboleth2.xml \
        attribute-map.xml \
        attribute-policy.xml \
+       protocols.xml \
+       security-policy.xml \
        example-metadata.xml \
+       example-shibboleth2.xml \
        console.logger \
        syslog.logger \
        accessError.html \
+    attrChecker.html \
        sessionError.html \
        metadataError.html \
        bindingTemplate.html \
+       discoveryTemplate.html \
+       postTemplate.html \
        localLogout.html \
        globalLogout.html \
+       partialLogout.html \
        sslError.html
 
 #
@@ -52,8 +63,8 @@ do-build-file:
         -e 's:@-PREFIX-@:${prefix}:g' \
         -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
         -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-        -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
         -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+        -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
         -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
         -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
         -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
@@ -72,6 +83,9 @@ apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.st
 shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
+shibd-suse: ${srcdir}/shibd-suse.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
 shibd-debian: ${srcdir}/shibd-debian.in Makefile ${top_builddir}/config.status
        $(MAKE) do-build-file FILE=$@
 
@@ -88,9 +102,9 @@ all-data-local: $(BUILTCONFIGFILES)
 
 install-data-local:    all-data-local
        $(mkinstalldirs) $(DESTDIR)$(pkglogdir)
-       $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
        $(mkinstalldirs) $(DESTDIR)$(shirelogdir)
        $(mkinstalldirs) $(DESTDIR)$(pkgrundir)
+    $(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
        $(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
        $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
        for f in $(BUILTCONFIGFILES); do \
@@ -107,6 +121,8 @@ install-data-local: all-data-local
         done
 
 install-data-hook:
+       chmod +x $(DESTDIR)$(pkgsysconfdir)/keygen.sh
+       chmod +x $(DESTDIR)$(pkgsysconfdir)/metagen.sh
        if test -z "$(NOKEYGEN)"; then \
                cd $(DESTDIR)$(pkgsysconfdir); \
                sh ./keygen.sh -b ; \
@@ -117,6 +133,7 @@ CLEANFILES = \
        apache2.config \
        apache22.config \
        shibd-redhat \
+       shibd-suse \
        shibd-debian \
        shibd-osx.plist \
        shibd.logger \
@@ -129,8 +146,12 @@ EXTRA_DIST = \
        apache2.config.in \
        apache22.config.in \
        shibd-redhat.in \
+       shibd-suse.in \
        shibd-debian.in \
        shibd-osx.plist.in \
        keygen.bat \
        keygen.sh \
+       metagen.sh \
+       upgrade.xsl \
+       xsltproc.js \
        $(CONFIGFILES)