X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2FMakefile.am;h=551908e5fddbb59ffb6509310aa21e50846cec4c;hb=ccc5adbaf732b0ae9687eb08dfceef166ee251ff;hp=418e8509d48ef2086ebb632f1a47e714171f0760;hpb=64394fedc07ac7c0dfe59cb9ecca3db469558283;p=shibboleth%2Fcpp-sp.git diff --git a/configs/Makefile.am b/configs/Makefile.am index 418e850..551908e 100644 --- a/configs/Makefile.am +++ b/configs/Makefile.am @@ -2,37 +2,59 @@ AUTOMAKE_OPTIONS = foreign -pkglogdir = ${localstatedir}/log/@PACKAGE@ -shirelogdir = ${localstatedir}/log/httpd -pkgxmldir = $(datadir)/xml/@PACKAGE@ -varrundir = /var/run -pkgsysconfdir = $(sysconfdir)/@PACKAGE@ +pkglibdir = ${libdir}/@PACKAGE_NAME@ +pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@ +shirelogdir = ${localstatedir}/log/@PACKAGE_NAME@-www +pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@ +pkgwebdir = $(datadir)/@PACKAGE_NAME@ +pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@ +pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@ +pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@ pkgsysconf_DATA = \ + shibd-redhat \ + shibd-amazon \ + shibd-suse \ + shibd-debian \ + shibd-osx.plist \ apache.config \ apache2.config \ - inqueue.pem + apache22.config \ + apache24.config \ + 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 # installed as "foo" if "foo" does not already exist. In other words, # 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 # While BUILTCONFIGFILES are processed, these are not; so we should pull # them from SRCDIR. CONFIGFILES = \ - shibboleth.logger \ + 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 \ - rmError.html \ + attrChecker.html \ sessionError.html \ - shar.key \ - shar.crt + metadataError.html \ + bindingTemplate.html \ + discoveryTemplate.html \ + postTemplate.html \ + localLogout.html \ + globalLogout.html \ + partialLogout.html \ + sslError.html # # Some of these need building @@ -40,13 +62,14 @@ CONFIGFILES = \ do-build-file: rm -f ${FILE}.tmp sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \ - -e 's:@-PREFIX-@:${prefix}:' \ - -e 's:@-LIBEXECDIR-@:${libexecdir}:' \ - -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \ - -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \ - -e 's:@-PKGLOGDIR-@:${pkglogdir}:' \ - -e 's:@-SHIRELOGDIR-@:${shirelogdir}:' \ - -e 's:@-VARRUNDIR-@:${varrundir}:' + -e 's:@-PREFIX-@:${prefix}:g' \ + -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \ + -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}: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' cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE} rm -f ${FILE}.tmp @@ -56,30 +79,41 @@ 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 +apache24.config: ${srcdir}/apache24.config.in Makefile ${top_builddir}/config.status $(MAKE) do-build-file FILE=$@ -shibboleth.xml: ${srcdir}/shibboleth.xml.in Makefile ${top_builddir}/config.status +shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status $(MAKE) do-build-file FILE=$@ -AAP.xml: ${srcdir}/AAP.xml.in Makefile ${top_builddir}/config.status +shibd-amazon: ${srcdir}/shibd-amazon.in Makefile ${top_builddir}/config.status $(MAKE) do-build-file FILE=$@ -IQ-sites.xml: ${srcdir}/IQ-sites.xml.in Makefile ${top_builddir}/config.status +shibd-suse: ${srcdir}/shibd-suse.in Makefile ${top_builddir}/config.status $(MAKE) do-build-file FILE=$@ -IQ-trust.xml: ${srcdir}/IQ-trust.xml.in Makefile ${top_builddir}/config.status +shibd-debian: ${srcdir}/shibd-debian.in Makefile ${top_builddir}/config.status + $(MAKE) do-build-file FILE=$@ + +shibd-osx.plist: ${srcdir}/shibd-osx.plist.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=$@ all-data-local: $(BUILTCONFIGFILES) install-data-local: all-data-local $(mkinstalldirs) $(DESTDIR)$(pkglogdir) + $(mkinstalldirs) $(DESTDIR)$(shirelogdir) + $(mkinstalldirs) $(DESTDIR)$(pkgrundir) + $(mkinstalldirs) $(DESTDIR)$(pkgcachedir) $(mkinstalldirs) $(DESTDIR)$(pkgxmldir) - $(mkinstalldirs) $(DESTDIR)$(prefix)/data $(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir) for f in $(BUILTCONFIGFILES); do \ if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \ @@ -94,29 +128,44 @@ install-data-local: all-data-local $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \ 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 ; \ + fi + CLEANFILES = \ apache.config \ apache2.config \ - shar.logger \ - shire.logger \ - shibboleth.xml \ - AAP.xml \ - IQ-sites.xml \ - IQ-trust.xml - -EXTRA_DIST = .cvsignore \ - shibboleth.xml.in \ - shire.logger.in \ - shar.logger.in \ + apache22.config \ + apache24.config \ + shibd-redhat \ + shibd-amazon \ + shibd-suse \ + shibd-debian \ + shibd-osx.plist \ + shibd.logger \ + native.logger + +EXTRA_DIST = \ + native.logger.in \ + shibd.logger.in \ apache.config.in \ apache2.config.in \ - shibboleth.logger \ - accessError.html \ - rmError.html \ - sessionError.html \ - AAP.xml.in \ - IQ-sites.xml.in \ - IQ-trust.xml.in \ - inqueue.pem \ - shar.key \ - shar.crt + apache22.config.in \ + apache24.config.in \ + shibd-redhat.in \ + shibd-amazon.in \ + shibd-suse.in \ + shibd-debian.in \ + shibd-osx.plist.in \ + keygen.bat \ + keygen.sh \ + metagen.sh \ + SetService32.bat \ + SetService64.bat \ + upgrade.xsl \ + xsltproc.js \ + $(CONFIGFILES)