projects
/
shibboleth
/
sp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix backslashes in SHIBSP_PREFIX variable by manually creating it during the script...
[shibboleth/sp.git]
/
configs
/
Makefile.am
diff --git
a/configs/Makefile.am
b/configs/Makefile.am
index
affbfee
..
d72363b
100644
(file)
--- a/
configs/Makefile.am
+++ b/
configs/Makefile.am
@@
-15,7
+15,9
@@
pkgsysconf_DATA = \
shibd-osx.plist \
apache.config \
apache2.config \
shibd-osx.plist \
apache.config \
apache2.config \
- apache22.config
+ apache22.config \
+ 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
# The config files are installed "special". Unlike the entries in
# pkgsysconf_DATA, these files are installed as "foo.dist" and only
@@
-28,21
+30,20
@@
BUILTCONFIGFILES = \
# While BUILTCONFIGFILES are processed, these are not; so we should pull
# them from SRCDIR.
CONFIGFILES = \
# 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 \
console.logger \
syslog.logger \
accessError.html \
sessionError.html \
metadataError.html \
bindingTemplate.html \
+ discoveryTemplate.html \
localLogout.html \
globalLogout.html \
localLogout.html \
globalLogout.html \
- sslError.html \
- sp-example.key \
- sp-example.crt
+ sslError.html
#
# Some of these need building
#
# Some of these need building
@@
-55,8
+56,6
@@
do-build-file:
-e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
-e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
-e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
-e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
-e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
- -e 's:@-XMLTOOLINGXMLDIR-@:${XMLTOOLINGXMLDIR}:g' \
- -e 's:@-OPENSAMLXMLDIR-@:${OPENSAMLXMLDIR}:g' \
-e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
-e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
-e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
-e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
-e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
@@
-109,6
+108,12
@@
install-data-local: all-data-local
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
done
$(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)${pkgsysconfdir}/$$f.dist; \
done
+install-data-hook:
+ if test -z "$(NOKEYGEN)"; then \
+ cd $(DESTDIR)$(pkgsysconfdir); \
+ sh ./keygen.sh -b ; \
+ fi
+
CLEANFILES = \
apache.config \
apache2.config \
CLEANFILES = \
apache.config \
apache2.config \
@@
-128,4
+133,8
@@
EXTRA_DIST = \
shibd-redhat.in \
shibd-debian.in \
shibd-osx.plist.in \
shibd-redhat.in \
shibd-debian.in \
shibd-osx.plist.in \
+ keygen.bat \
+ keygen.sh \
+ upgrade.xsl \
+ xsltproc.js \
$(CONFIGFILES)
$(CONFIGFILES)