X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2FMakefile.am;h=551908e5fddbb59ffb6509310aa21e50846cec4c;hb=ccc5adbaf732b0ae9687eb08dfceef166ee251ff;hp=5224c4ef3e9ff699137e841f873331a6811dcf26;hpb=f9896d1b352cd52153f6680aa10779ed5b543793;p=shibboleth%2Fcpp-sp.git

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 5224c4e..551908e 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,21 +2,24 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-pkglibdir = ${libdir}/@PACKAGE@
-pkglogdir = ${localstatedir}/log/@PACKAGE@
-shirelogdir = ${localstatedir}/log/httpd
-pkgxmldir = $(datadir)/xml/@PACKAGE@
-pkgwebdir = $(datadir)/@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-redhat \
+    shibd-amazon \
 	shibd-suse \
 	shibd-debian \
 	shibd-osx.plist \
 	apache.config \
 	apache2.config \
 	apache22.config \
+	apache24.config \
 	keygen.sh \
 	metagen.sh \
 	upgrade.xsl
@@ -42,6 +45,7 @@ CONFIGFILES = \
 	console.logger \
 	syslog.logger \
 	accessError.html \
+	attrChecker.html \
 	sessionError.html \
 	metadataError.html \
 	bindingTemplate.html \
@@ -58,14 +62,14 @@ 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:@-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:@-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
 
@@ -78,9 +82,15 @@ 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-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=$@
 
@@ -102,6 +112,7 @@ install-data-local:	all-data-local
 	$(mkinstalldirs) $(DESTDIR)$(pkglogdir)
 	$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
+	$(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
 	for f in $(BUILTCONFIGFILES); do \
@@ -129,7 +140,9 @@ CLEANFILES = \
 	apache.config \
 	apache2.config \
 	apache22.config \
+	apache24.config \
 	shibd-redhat \
+    shibd-amazon \
 	shibd-suse \
 	shibd-debian \
 	shibd-osx.plist \
@@ -142,13 +155,17 @@ EXTRA_DIST = \
 	apache.config.in \
 	apache2.config.in \
 	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)