X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2FMakefile.am;h=ce067cccbb4e74dba566c1e67e3bbd3d3539b16b;hb=0725a71d237fced80bffef5c1822b2b045fc649c;hp=cbb949f2b3791e06bffc772bfb7169e8defaaa71;hpb=9cad9d89bb2d9d1c0d11b07e438a3e757dee3507;p=shibboleth%2Fsp.git

diff --git a/configs/Makefile.am b/configs/Makefile.am
index cbb949f..ce067cc 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -2,12 +2,12 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+pkglibdir = ${libdir}/@PACKAGE@
 pkglogdir = ${localstatedir}/log/@PACKAGE@
 pkgdocdir = ${datadir}/doc/@PACKAGE@
 shirelogdir = ${localstatedir}/log/httpd
-xmldir = $(datadir)/xml
 pkgxmldir = $(datadir)/xml/@PACKAGE@
-varrundir = $(localstatedir)/run
+pkgrundir = $(localstatedir)/run/@PACKAGE@
 pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 pkgsysconf_DATA = \
 	shibd-redhat \
@@ -15,23 +15,24 @@ pkgsysconf_DATA = \
 	shibd-osx.plist \
 	apache.config \
 	apache2.config \
-	apache22.config
+	apache22.config \
+	keygen.sh
 
 # 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 = \
-	shibboleth2.xml \
 	native.logger \
-	shibd.logger \
-	attribute-map.xml \
-	attribute-policy.xml \
-	example-metadata.xml
+	shibd.logger
 
 # While BUILTCONFIGFILES are processed, these are not; so we should pull
 # them from SRCDIR.
 CONFIGFILES = \
+    shibboleth2.xml \
+    attribute-map.xml \
+    attribute-policy.xml \
+    example-metadata.xml \
 	console.logger \
 	syslog.logger \
 	accessError.html \
@@ -40,9 +41,7 @@ CONFIGFILES = \
 	bindingTemplate.html \
 	localLogout.html \
 	globalLogout.html \
-	sslError.html \
-	sp-example.key \
-	sp-example.crt
+	sslError.html
 
 #
 # Some of these need building
@@ -51,14 +50,13 @@ do-build-file:
 	rm -f ${FILE}.tmp
 	sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
         -e 's:@-PREFIX-@:${prefix}:g' \
-        -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
+        -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
         -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-        -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
         -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
-        -e 's:@-XMLDIR-@:${xmldir}:g' \
+        -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
         -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
         -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-        -e 's:@-VARRUNDIR-@:${varrundir}:g'
+        -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
 	cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
 	rm -f ${FILE}.tmp
 
@@ -86,25 +84,13 @@ shibd.logger: ${srcdir}/shibd.logger.in Makefile ${top_builddir}/config.status
 native.logger: ${srcdir}/native.logger.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
 
-shibboleth2.xml: ${srcdir}/shibboleth2.xml.in Makefile ${top_builddir}/config.status
-	$(MAKE) do-build-file FILE=$@
-
-attribute-map.xml: ${srcdir}/attribute-map.xml.in Makefile ${top_builddir}/config.status
-	$(MAKE) do-build-file FILE=$@
-
-attribute-policy.xml: ${srcdir}/attribute-policy.xml.in Makefile ${top_builddir}/config.status
-	$(MAKE) do-build-file FILE=$@
-
-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)$(pkgdocdir)
 	$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
-	$(mkinstalldirs) $(DESTDIR)$(varrundir)
+	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
 	$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
 	for f in $(BUILTCONFIGFILES); do \
@@ -119,6 +105,10 @@ install-data-local:	all-data-local
 		fi; \
 		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
         done
+    if test -z $NOKEYGEN ; then
+        cd $(DESTDIR)$(pkgsysconfdir)
+        sh ./keygen.sh -b
+    fi
 
 CLEANFILES = \
 	apache.config \
@@ -128,17 +118,9 @@ CLEANFILES = \
 	shibd-debian \
 	shibd-osx.plist \
 	shibd.logger \
-	native.logger \
-	shibboleth2.xml \
-	attribute-map.xml \
-	attribute-policy.xml \
-	example-metadata.xml
+	native.logger
 
 EXTRA_DIST = \
-	shibboleth2.xml.in \
-	attribute-map.xml.in \
-	attribute-policy.xml.in \
-	example-metadata.xml.in \
 	native.logger.in \
 	shibd.logger.in \
 	apache.config.in \
@@ -147,4 +129,5 @@ EXTRA_DIST = \
 	shibd-redhat.in \
 	shibd-debian.in \
 	shibd-osx.plist.in \
+    keygen.bat \
 	$(CONFIGFILES)