X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=configs%2FMakefile.am;h=52514b22a1fd0ebdbdc1a7bfc8bb0694673e8dcf;hb=ee0dc0ae409e04a7d626ba474f976793e9eadb78;hp=8ffb8628b0022578bbb768b56a7fa9e09e8c076a;hpb=5a6319ff56649119ea40940baa9fc75d246ad55d;p=shibboleth%2Fsp.git

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 8ffb862..52514b2 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -16,7 +16,8 @@ pkgsysconf_DATA = \
 	apache.config \
 	apache2.config \
 	apache22.config \
-	keygen.sh
+	keygen.sh \
+    upgrade.xsl
 
 # The config files are installed "special".  Unlike the entries in
 # pkgsysconf_DATA, these files are installed as "foo.dist" and only
@@ -29,16 +30,17 @@ BUILTCONFIGFILES = \
 # 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 \
+	shibboleth2.xml \
+	attribute-map.xml \
+	attribute-policy.xml \
+	example-metadata.xml \
 	console.logger \
 	syslog.logger \
 	accessError.html \
 	sessionError.html \
 	metadataError.html \
 	bindingTemplate.html \
+	discoveryTemplate.html \
 	localLogout.html \
 	globalLogout.html \
 	sslError.html
@@ -105,10 +107,12 @@ 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
+
+install-data-hook:
+	if test -z "$(NOKEYGEN)"; then \
+		cd $(DESTDIR)$(pkgsysconfdir); \
+		sh ./keygen.sh -b ; \
+	fi
 
 CLEANFILES = \
 	apache.config \
@@ -129,5 +133,8 @@ EXTRA_DIST = \
 	shibd-redhat.in \
 	shibd-debian.in \
 	shibd-osx.plist.in \
-	$(CONFIGFILES) \
-	keygen.bat
+	keygen.bat \
+	keygen.sh \
+    upgrade.xsl \
+	xsltproc.js \
+	$(CONFIGFILES)