[cpp-sp COMMIT] /branches/REL_2/shibsp/base.h

[noreply at shibboleth.net]

Author: scantor
Date: Sun May 20 22:21:50 2012
New Revision: 3673

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3673&view=rev
Log:
Modify Windows schema and library paths

Modified:
    branches/REL_2/shibsp/base.h

Modified: branches/REL_2/shibsp/base.h
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/shibsp/base.h?rev=3673&r1=3672&r2=3673&view=diff
==============================================================================
--- branches/REL_2/shibsp/base.h (original)
+++ branches/REL_2/shibsp/base.h Sun May 20 22:21:50 2012
@@ -100,13 +100,22 @@
 #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"