X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2FMakefile.am;h=31154b137cf5ad01824820efe2fa16051058b001;hb=1547c01785f3d5d740629a0f192f85b36888239b;hp=4dbcb1882447742d7904cd2c3a3e44e860adba09;hpb=24ef76847eed027ef07698c0d085710e2779fdba;p=shibboleth%2Fcpp-sp.git

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 4dbcb18..31154b1 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,21 +2,25 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglibdir = ${libdir}/@PACKAGE@
-pkglogdir = ${localstatedir}/log/@PACKAGE@
-pkgdocdir = $(datadir)/doc/@PACKAGE@-@PACKAGE_VERSION@
-shirelogdir = ${localstatedir}/log/httpd
-pkgxmldir = $(datadir)/xml/@PACKAGE@
-pkgrundir = $(localstatedir)/run/@PACKAGE@
-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-systemd \
 	shibd-redhat \
+	shibd-amazon \
 	shibd-suse \
 	shibd-debian \
 	shibd-osx.plist \
 	apache.config \
 	apache2.config \
 	apache22.config \
+	apache24.config \
 	keygen.sh \
 	metagen.sh \
 	upgrade.xsl
@@ -35,17 +39,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 \
+	postTemplate.html \
 	localLogout.html \
 	globalLogout.html \
+	partialLogout.html \
 	sslError.html
 
 #
@@ -54,14 +63,15 @@ CONFIGFILES = \
 do-build-file:
 	rm -f ${FILE}.tmp
 	sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-        -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:@-PKGLOGDIR-@:${pkglogdir}:g' \
-        -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-        -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
+		-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' \
+		-e 's:@-PKGCACHEDIR-@:${pkgcachedir}:g'
 	cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
 	rm -f ${FILE}.tmp
 
@@ -74,11 +84,20 @@ apache2.config: ${srcdir}/apache2.config.in Makefile ${top_builddir}/config.stat
 apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
 
+apache24.config: ${srcdir}/apache24.config.in Makefile ${top_builddir}/config.status
+	$(MAKE) do-build-file FILE=$@
+
+shibd-systemd: ${srcdir}/shibd-systemd.in Makefile ${top_builddir}/config.status
+	$(MAKE) do-build-file FILE=$@
+
 shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
 
+shibd-amazon: ${srcdir}/shibd-amazon.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=$@
+	$(MAKE) do-build-file FILE=$@
 
 shibd-debian: ${srcdir}/shibd-debian.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
@@ -96,9 +115,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 \
@@ -126,7 +145,10 @@ CLEANFILES = \
 	apache.config \
 	apache2.config \
 	apache22.config \
+	apache24.config \
+	shibd-systemd \
 	shibd-redhat \
+	shibd-amazon \
 	shibd-suse \
 	shibd-debian \
 	shibd-osx.plist \
@@ -139,13 +161,18 @@ EXTRA_DIST = \
 	apache.config.in \
 	apache2.config.in \
 	apache22.config.in \
+	apache24.config.in \
+	shibd-systemd.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)