[GRASS-SVN] r57369 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2013-08-02 09:38:24 -0700 (Fri, 02 Aug 2013)
New Revision: 57369

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
   grass/trunk/mswindows/Makefile
Log:
wingrass: remove unused OSGEO4W_DIR_POSTFIX


Modified: grass/trunk/mswindows/GRASS-Installer.nsi.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2013-08-02 13:40:31 UTC (rev 57368)
+++ grass/trunk/mswindows/GRASS-Installer.nsi.tmpl	2013-08-02 16:38:24 UTC (rev 57369)
@@ -10,11 +10,11 @@
 
 ;Define the source path of the demolocation files
 
-!define DEMOLOCATION_PATH "c:\OSGeo4W at OSGEO4W_DIR_POSTFIX@\usr\src\grass_trunk\demolocation"
+!define DEMOLOCATION_PATH "c:\OSGeo4W\usr\src\grass_trunk\demolocation"
 
 ;Define the source of the patched msys.bat
 
-!define MSYS_BATCH "C:\OSGeo4W at OSGEO4W_DIR_POSTFIX@\usr\src\grass_trunk\mswindows\osgeo4w\msys.bat"
+!define MSYS_BATCH "C:\OSGeo4W\usr\src\grass_trunk\mswindows\osgeo4w\msys.bat"
 
 ;Select if you are building a "Development Version" (Devel) or a "Release Version" (Release) of the GRASS Installer
 
@@ -887,13 +887,13 @@
 
 	;replace gisbase
 	Push "$INSTDIR\etc\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" ; file to modify
-	Push 'gisbase = "/c/OSGeo4W at OSGEO4W_DIR_POSTFIX@/apps/grass/grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@"' ; string that a line must begin with *WS Sensitive*
+	Push 'gisbase = "/c/OSGeo4W/apps/grass/grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@"' ; string that a line must begin with *WS Sensitive*
 	Push 'gisbase = "$INSTDIR"' ; string to replace whole line with
 	Call ReplaceLineStr
 	
 	;replace config_projshare
 	Push "$INSTDIR\etc\grass at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at .py" ; file to modify
-	Push 'config_projshare = "/c/OSGeo4W at OSGEO4W_DIR_POSTFIX@/share/proj"' ; string that a line must begin with *WS Sensitive*
+	Push 'config_projshare = "/c/OSGeo4W/share/proj"' ; string that a line must begin with *WS Sensitive*
 	Push 'config_projshare = "$INSTDIR\share\proj"' ; string to replace whole line with
 	Call ReplaceLineStr
                  

Modified: grass/trunk/mswindows/Makefile
===================================================================
--- grass/trunk/mswindows/Makefile	2013-08-02 13:40:31 UTC (rev 57368)
+++ grass/trunk/mswindows/Makefile	2013-08-02 16:38:24 UTC (rev 57369)
@@ -4,10 +4,6 @@
 
 EXTRA_CLEAN_FILES = GRASS-Packager.bat GRASS-Installer.nsi
 
-# OSGeo4W directory postfix, separate OSGeo4W installations are used
-# for building GRASS 6.x and 7.x
-OSGEO4W_DIR_POSTFIX = '_g7'
-
 ifneq ($(MINGW),)
 default: GRASS-Packager.bat GRASS-Installer.nsi
 else
@@ -19,7 +15,6 @@
 	-e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
 	-e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
 	-e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
-	-e 's#@OSGEO4W_DIR_POSTFIX@#$(OSGEO4W_DIR_POSTFIX)#' \
 	$< > $@
 
 GRASS-Installer.nsi: GRASS-Installer.nsi.tmpl
@@ -28,5 +23,4 @@
 	-e 's#@GRASS_VERSION_MAJOR@#$(GRASS_VERSION_MAJOR)#' \
 	-e 's#@GRASS_VERSION_MINOR@#$(GRASS_VERSION_MINOR)#' \
 	-e 's#@GRASS_VERSION_RELEASE@#$(GRASS_VERSION_RELEASE)#' \
-	-e 's#@OSGEO4W_DIR_POSTFIX@#$(OSGEO4W_DIR_POSTFIX)#' \
 	$< > $@