[gimp/gimp-2-8] Installer: make it possible to override source directories from command line using defines

[Jernej Simončič <jernejs src gnome org>]

commit 06771172427ff3a84b18a0b47a0c4d18f515e2b0
Author: Jernej Simončič <jernej|s-cccp eternallybored org>
Date:   Sat Nov 30 18:50:14 2013 +0100

    Installer: make it possible to override source directories from command line
    using defines

 build/windows/installer/directories.isi |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/build/windows/installer/directories.isi b/build/windows/installer/directories.isi
index 2f3c230..cf98a68 100644
--- a/build/windows/installer/directories.isi
+++ b/build/windows/installer/directories.isi
@@ -1,5 +1,5 @@
 //directories to source files from
-#if !Defined(VERSION)
+#if !defined(VERSION)
   #error "VERSION must be defined"
 #endif
 
@@ -23,14 +23,28 @@
        #define DEPS_DIR "N:\_newdev\deps-mgw\usr"
 #endif
 
-#define GIMP_DIR32 GIMP_DIR + "\" + DIR32
-#define GIMP_DIR64 GIMP_DIR + "\" + DIR64
+//32-bit GIMP base directory (result of make install)
+#ifndef GIMP_DIR32
+       #define GIMP_DIR32 GIMP_DIR + "\" + DIR32
+#endif
+//64-bit GIMP base directory (result of make install)
+#ifndef GIMP_DIR64
+       #define GIMP_DIR64 GIMP_DIR + "\" + DIR64
+#endif
 
 #define DDIR32 DIR32 + "-w64-mingw32\sys-root\mingw"
 #define DDIR64 DIR64 + "-w64-mingw32\sys-root\mingw"
 
-#define DEPS_DIR32 DEPS_DIR + "\" + DDIR32
-#define DEPS_DIR64 DEPS_DIR + "\" + DDIR64
+//32-bit dependencies directory
+#ifndef DEPS_DIR32
+       #define DEPS_DIR32 DEPS_DIR + "\" + DDIR32
+#endif
+//64-bit dependencies directory
+#ifndef DEPS_DIR64
+       #define DEPS_DIR64 DEPS_DIR + "\" + DDIR64
+#endif
 
-//#define PY_DIR DEPS_DIR + "\python"
-#define PY_DIR "N:\_newdev\deps\gimp\python"
\ No newline at end of file
+//python source directory
+#ifndef PY_DIR
+       #define PY_DIR "N:\_newdev\deps\gimp\python"
+#endif