[GRASS-SVN] r40064 - grass/branches/develbranch_6/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-12-19 08:20:05 -0500 (Sat, 19 Dec 2009)
New Revision: 40064

Modified:
   grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
Log:
simplify package.sh
	 (merge r40063 from relbr64)


Modified: grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2009-12-19 13:13:19 UTC (rev 40063)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2009-12-19 13:20:05 UTC (rev 40064)
@@ -1,4 +1,4 @@
-#!/c/Programme/OSGeo4W/apps/msys/bin/sh
+#!/c/OSGeo4W/apps/msys/bin/sh
 
 set -e
 
@@ -7,9 +7,8 @@
 	exit 1
 fi
 
-#portable? can we use %PROGRAMFILES% -> $PROGRAMFILES here?
-OSGEO4W_ROOT_MSYS="/c/Programme/OSGeo4W"
-PATH="/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem"
+OSGEO4W_ROOT_MSYS=/c/OSGeo4W
+PATH=.:/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem
 export OSGEO4W_ROOT_MSYS PATH
 
 version() {
@@ -66,7 +65,7 @@
 fi
 
 echo $(date): STARTING make
-make -j4 || make -j4
+make || make
 
 echo $(date): STARTING make install
 make install
@@ -84,9 +83,9 @@
 cp mswindows/osgeo4w/ini.bat.tmpl "$OSGEO4W_ROOT_MSYS/etc/ini/grass.bat.tmpl"
 cp mswindows/osgeo4w/postinstall.bat "$OSGEO4W_ROOT_MSYS/etc/postinstall/grass.bat"
 cp mswindows/osgeo4w/preremove.bat "$OSGEO4W_ROOT_MSYS/etc/preremove/grass.bat"
-cp /c/mingw/bin/libgnurx-0.dll "$OSGEO_ROOT_MSYS/bin"
-cp /c/mingw/bin/libiconv-2.dll "$OSGEO_ROOT_MSYS/bin"
-cp /c/mingw/bin/libintl-8.dll "$OSGEO_ROOT_MSYS/bin"
+#cp /c/mingw/bin/libgnurx-0.dll "$OSGEO_ROOT_MSYS/bin"
+#cp /c/mingw/bin/libiconv-2.dll "$OSGEO_ROOT_MSYS/bin"
+#cp /c/mingw/bin/libintl-8.dll "$OSGEO_ROOT_MSYS/bin"
 
 P="$(pwd -W)"
 P="${P//\//\\\\}\\\\dist.i686-pc-mingw32"