From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Sun, 20 May 2012 21:21:50 +0000 (+0000)
Subject: Modify Windows schema and library paths
X-Git-Tag: 2.5.0~85
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=31e1ab7302abf7bc27bd077d86e0fa4ec82e85f6

Modify Windows schema and library paths

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3673 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/shibsp/base.h b/shibsp/base.h
index 4c3d53c..92fdb5d 100644
--- a/shibsp/base.h
+++ b/shibsp/base.h
@@ -100,14 +100,23 @@
 #ifdef WIN32
 
 /** Default catalog path on Windows. */
-# define SHIBSP_SCHEMAS "c:/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml;c:/opt/shibboleth-sp/share/xml/opensaml/saml20-catalog.xml;c:/opt/shibboleth-sp/share/xml/opensaml/saml11-catalog.xml;c:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
+# define SHIBSP_SCHEMAS "%ALLUSERSPROFILE%/Shibboleth/SP/xml/xmltooling/catalog.xml;%ALLUSERSPROFILE%/Shibboleth/SP/xml/opensaml/saml20-catalog.xml;%ALLUSERSPROFILE%/Shibboleth/SP/xml/opensaml/saml11-catalog.xml;%ALLUSERSPROFILE%/Shibboleth/SP/xml/shibboleth/catalog.xml"
 
 /** Default prefix for installation (used to resolve relative paths). */
 #define SHIBSP_PREFIX   "c:/opt/shibboleth-sp"
 
+#ifdef _WIN64
+
+/** Library directory for installation (used to resolve relative paths). */
+#define SHIBSP_LIBDIR   "lib64"
+
+#else
+
 /** Library directory for installation (used to resolve relative paths). */
 #define SHIBSP_LIBDIR   "lib"
 
+#endif
+
 /** Log directory for installation (used to resolve relative paths). */
 #define SHIBSP_LOGDIR   "var/log"