Glade path conversion under win32.

diff --git a/glade/Makefile.am b/glade/Makefile.am
index becca9cddef1e917e32e276f72388dfe67f8937e..2875e3cd8d4727aa4cca2a008e981bac9062c237 100644 (file)
--- a/glade/Makefile.am
+++ b/glade/Makefile.am
@@ -1,18 +1,19 @@
 SUBDIRS = icons
 
-glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0`
-
-gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0`
 
 gladecatalogs_DATA = gtkmapserver.xml
 
 EXTRA_DIST = $(gladecatalogs_DATA)
 
 if PLATFORM_WIN32
+glademodulesdir = `cygpath \`pkg-config --variable=moduledir gladeui-2.0\``
+gladecatalogsdir = `cygpath \`pkg-config --variable=catalogdir gladeui-2.0\``
 libmodulesext = -0.dll
 libmodulesextglade = .dll
 libmodulesdir = $(bindir)
 else
+glademodulesdir = `pkg-config --variable=moduledir gladeui-2.0`
+gladecatalogsdir = `pkg-config --variable=catalogdir gladeui-2.0`
 libmodulesext = .so
 libmodulesextglade = $(libmodulesext)
 libmodulesdir = $(libdir)

diff --git a/glade/icons/hicolor/16x16/actions/Makefile.am b/glade/icons/hicolor/16x16/actions/Makefile.am
index aa80902b2c330a9921bdec4b864757a0b4f3d921..0d6d8b68183a4cf8bc264737fcdb5a88e4447a23 100644 (file)
--- a/glade/icons/hicolor/16x16/actions/Makefile.am
+++ b/glade/icons/hicolor/16x16/actions/Makefile.am
@@ -1,4 +1,8 @@
+if PLATFORM_WIN32
+iconsdir = `cygpath \`pkg-config --variable=pixmapdir gladeui-2.0\``/hicolor/16x16/actions
+else
 iconsdir = `pkg-config --variable=pixmapdir gladeui-2.0`/hicolor/16x16/actions
+endif
 
 icons_DATA = widget-gtkmapserver-gtkmapserver.png
 

diff --git a/glade/icons/hicolor/22x22/actions/Makefile.am b/glade/icons/hicolor/22x22/actions/Makefile.am
index 9e270b0f0679a2f500dbfe741ea2f8ba0f8207e5..ed407dd8cf15e20d4593d547801a236bced2ae9a 100644 (file)
--- a/glade/icons/hicolor/22x22/actions/Makefile.am
+++ b/glade/icons/hicolor/22x22/actions/Makefile.am
@@ -1,4 +1,8 @@
+if PLATFORM_WIN32
+iconsdir = `cygpath \`pkg-config --variable=pixmapdir gladeui-2.0\``/hicolor/22x22/actions
+else
 iconsdir = `pkg-config --variable=pixmapdir gladeui-2.0`/hicolor/22x22/actions
+endif
 
 icons_DATA = widget-gtkmapserver-gtkmapserver.png