[gcompris/GCOMPRIS_8_3] Added support for making the installer from GNU/Linux.

[Bruno Coudoin <bcoudoin src gnome org>]

commit 031985212f6c2c9cb653d54269d5dd4bcc2b60c1
Author: Bruno Coudoin <bruno coudoin free fr>
Date:   Sun Jul 5 16:49:07 2009 +0200

    Added support for making the installer from GNU/Linux.

 Makefile.mingw   |    2 --
 global_win32.mak |    4 +++-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.mingw b/Makefile.mingw
index d95649e..05d47e1 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -14,8 +14,6 @@ GCOMPRIS_INSTALL_DIR = ./win32-install-dir
 
 include global_win32.mak
 
-MAKENSIS := "/c/Program Files/NSIS/makensis.exe"
-
 # These will be copied in the win32-install-dir ready to be packaged.
 NEEDED_DLLS =		$(GNUCAP_TOP)/src/MSW/gnucap.exe \
 			$(GNUCHESS_TOP)/bin/gnuchess.exe \
diff --git a/global_win32.mak b/global_win32.mak
index 71c9bec..8d642bc 100644
--- a/global_win32.mak
+++ b/global_win32.mak
@@ -43,10 +43,12 @@ ifneq ($(CROSSCOMPILER),)
 	# CROSS COMPILATION
 	LOCAL_PREFIX:=/home/bruno/Projets/gcompris/windows
 	MSVCR71_DLL:=$(LOCAL_PREFIX)/msvcr71.dll
+	MAKENSIS:=makensis
 else
 	# MSYS CASE
 	LOCAL_PREFIX:=
 	MSVCR71_DLL:=/c/WINDOWS/system32/msvcr71.dll
+	MAKENSIS:="/c/Program Files/NSIS/makensis.exe"
 endif
 
 GTK_TOP :=		$(LOCAL_PREFIX)/gtk
@@ -60,4 +62,4 @@ GNUCAP_TOP :=		$(LOCAL_PREFIX)/gnucap
 SQLITE_TOP :=		$(LOCAL_PREFIX)/sqlite
 FONTCONFIG_TOP :=	$(LOCAL_PREFIX)/fontconfig
 ICONV_TOP :=		$(LOCAL_PREFIX)/iconv
-FREETYPE_TOP :=		$(LOCAL_PREFIX)/freetype
\ No newline at end of file
+FREETYPE_TOP :=		$(LOCAL_PREFIX)/freetype