From 19a29f82c0d6563f1c156f5774dae884510d12d3 Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Thu, 20 Aug 2015 20:06:39 +0200 Subject: [PATCH] Glade path conversion under win32. --- glade/Makefile.am | 7 ++++--- glade/icons/hicolor/16x16/actions/Makefile.am | 4 ++++ glade/icons/hicolor/22x22/actions/Makefile.am | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/glade/Makefile.am b/glade/Makefile.am index becca9c..2875e3c 100644 --- 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 aa80902..0d6d8b6 100644 --- 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 9e270b0..ed407dd 100644 --- 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 -- 2.49.0