patch 1491236 minor win32 build adjustment

diff --git a/Makefile.mingw.common b/Makefile.mingw.common
index be23d1ac89d722c153db26f3d75f708b3af4e40c..f619f2a886a111b00c4c70f018c1f0276abe4275 100644 (file)
--- a/Makefile.mingw.common
+++ b/Makefile.mingw.common
@@ -118,10 +118,14 @@ RMDIRREC = cd inkscape & $(RMDIR) /s
 RMDIRREC1 = & cd ..
 
 #######  Where is your GTK directory?
+ifndef GTK
 GTK=c:/gtk28
+endif
 
 ####### Same thing, DOS style
+ifndef GTKDOS
 GTKDOS=c:\gtk28
+endif
 
 ####### Command to process .po files --> .mo
 MSGFMT = $(GTKDOS)$(S)bin$(S)msgfmt

diff --git a/mingwenv.bat b/mingwenv.bat
index af77b7b6f61cbdf749e237099fddb45488a0a97a..b5f04350a789b269a3c5dbbc5652dacf3888c99f 100755 (executable)
--- a/mingwenv.bat
+++ b/mingwenv.bat
@@ -1,4 +1,5 @@
 @echo Setting environment variables for MinGw build of Inkscape
-set GTK=c:\gtk28
-set path=c:\mingw\bin;%GTK%\bin;%path%
+set GTK=c:/gtk28
+set GTKDOS=c:\gtk28
+set path=c:\mingw\bin;%GTKDOS%\bin;%path%