[cpp-sp] 02/02: Distribution fixes, conditional install of config file.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-sp.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-sp.git;a=commit;h=52f33cdd00a0a525a9eec498b048bace90776edc

commit 52f33cdd00a0a525a9eec498b048bace90776edc
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Apr 27 16:23:50 2018 -0400

    Distribution fixes, conditional install of config file.
---
 configs/Makefile.am | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/configs/Makefile.am b/configs/Makefile.am
index f5f231e..bfa0840 100644
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -36,7 +36,6 @@ BUILTCONFIGFILES = \
 # While BUILTCONFIGFILES are processed, these are not; so we should pull
 # them from SRCDIR.
 CONFIGFILES = \
-	shibboleth3.xml \
 	attribute-map.xml \
 	attribute-policy.xml \
 	protocols.xml \
@@ -122,13 +121,19 @@ install-data-local:	all-data-local
 			$(INSTALL_DATA) $$f $(DESTDIR)${pkgsysconfdir}; \
 		fi; \
 		$(INSTALL_DATA) $$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
-        done
+		done
 	for f in $(CONFIGFILES); do \
 		if test ! -f $(DESTDIR)${pkgsysconfdir}/$$f; then \
 			$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}; \
 		fi; \
 		$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
-        done
+		done
+	if test ! -f $(DESTDIR)${pkgsysconfdir}/shibboleth3.xml; then \
+		if test ! -f $(DESTDIR)${pkgsysconfdir}/shibboleth2.xml; then \
+			$(INSTALL_DATA) $(srcdir)/shibboleth3.xml $(DESTDIR)${pkgsysconfdir}; \
+		fi; \
+	fi; \
+	$(INSTALL_DATA) $(srcdir)/shibboleth3.xml $(DESTDIR)${pkgsysconfdir}/shibboleth3.xml.dist
 
 install-data-hook:
 	chmod +x $(DESTDIR)$(pkgsysconfdir)/keygen.sh
@@ -168,6 +173,7 @@ EXTRA_DIST = \
 	keygen.sh \
 	metagen.sh \
 	seckeygen.sh \
-	SetService32.bat \
-	SetService64.bat \
+	shibboleth3.xml \
+	win-shibboleth3.xml \
+	win-native.logger \
 	$(CONFIGFILES)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.