Moved path constants into main header for WIN32

diff --git a/config_win32.h b/config_win32.h
index e1dd57a..1b41134 100644 (file)
--- a/config_win32.h
+++ b/config_win32.h
@@ -118,9 +118,3 @@
 
 /* Define to `unsigned' if <sys/types.h> does not define. */
 /* #undef size_t */
-
-/* SHIB_SCHEMAS defines the default location where the schemas will be installed. */
-#define SHIB_SCHEMAS "/opt/shibboleth/etc/shibboleth"
-
-/* SHIB_CONFIG defines the default location of the Shib Target Configuration File. */
-#define SHIB_CONFIG "/opt/shibboleth/etc/shibboleth/shibboleth.xml"

diff --git a/shib-target/shib-target.h b/shib-target/shib-target.h
index d3aeb8a..17b1770 100644 (file)
--- a/shib-target/shib-target.h
+++ b/shib-target/shib-target.h
@@ -66,6 +66,8 @@
 # ifndef SHIBTARGET_EXPORTS
 #  define SHIBTARGET_EXPORTS __declspec(dllimport)
 # endif
+# define SHIB_SCHEMAS "/opt/shibboleth/etc/shibboleth"
+# define SHIB_CONFIG "/opt/shibboleth/etc/shibboleth/shibboleth.xml"
 #else
 # include <shib-target/shib-paths.h>
 # define SHIBTARGET_EXPORTS