Unix installation fixes

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/trunk@2282 cb58f699-b61c-0410-a6fe-9272a202ed29

diff --git a/configs/Makefile.am b/configs/Makefile.am
index 0c5838f..b59f561 100644 (file)
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@ -45,13 +45,13 @@ CONFIGFILES = \
 do-build-file:
        rm -f ${FILE}.tmp
        sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-           -e 's:@-PREFIX-@:${prefix}:' \
-           -e 's:@-LIBEXECDIR-@:${libexecdir}:' \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
-           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:' \
-           -e 's:@-PKGLOGDIR-@:${pkglogdir}:' \
-           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:' \
-           -e 's:@-VARRUNDIR-@:${varrundir}:'
+           -e 's:@-PREFIX-@:${prefix}:g' \
+           -e 's:@-LIBEXECDIR-@:${libexecdir}:g' \
+           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+           -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
+           -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
+           -e 's:@-VARRUNDIR-@:${varrundir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 
@@ -119,7 +119,7 @@ CLEANFILES = \
        attribute-policy.xml \
        example-metadata.xml
 
-EXTRA_DIST =
+EXTRA_DIST = \
        shibboleth.xml.in \
        attribute-map.xml.in \
        attribute-policy.xml.in \

diff --git a/configs/console.logger b/configs/console.logger
index f390e1a..c3d264a 100644 (file)
--- a/configs/console.logger
+++ b/configs/console.logger
@@ -1,4 +1,4 @@
-log4j.rootCategory=INFO, console\r
+log4j.rootCategory=WARN, console\r
 \r
 # fairly verbose for DEBUG, so generally leave at INFO\r
 log4j.category.XMLTooling.XMLObject=INFO\r

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 84c9e99..7a52a98 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -26,7 +26,7 @@ pkgxml_DATA = \
 do-build-file:
        rm -f ${FILE}.tmp
        sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
-           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:'
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g'
        cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
        rm -f ${FILE}.tmp
 

diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 8666ca6..b851cff 100644 (file)
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -184,8 +184,8 @@ libshibsp_lite_la_CPPFLAGS = -DSHIBSP_LITE
 paths.h: ${srcdir}/paths.h.in Makefile ${top_builddir}/config.status
        rm -f $@.tmp
        sed < ${srcdir}/$@.in > $@.tmp \
-           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:' \
-           -e 's:@-XMLDIR-@:${xmldir}:'
+           -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+           -e 's:@-XMLDIR-@:${xmldir}:g'
        cmp -s $@ $@.tmp || mv $@.tmp $@
        rm -f $@.tmp
 

diff --git a/shibsp/impl/XMLServiceProvider.cpp b/shibsp/impl/XMLServiceProvider.cpp
index ad339fa..9d94401 100644 (file)
--- a/shibsp/impl/XMLServiceProvider.cpp
+++ b/shibsp/impl/XMLServiceProvider.cpp
@@ -445,8 +445,8 @@ XMLApplication::XMLApplication(
         SPConfig& conf=SPConfig::getConfig();
 #ifndef SHIBSP_LITE
         SAMLConfig& samlConf=SAMLConfig::getConfig();
-#endif
         XMLToolingConfig& xmlConf=XMLToolingConfig::getConfig();
+#endif
 
         // This used to be an actual hash, but now it's just a hex-encode to avoid xmlsec.
         static char DIGITS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};