Changeset 40063

Timestamp:

Dec 19, 2009, 5:13:19 AM (15 years ago)

Author:

martinl

Message:

simplify package.sh

File:

• grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh (modified) (4 diffs)

grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh

@@ -1 @@
-#!/c/Programme/OSGeo4W/apps/msys/bin/sh
+#!/c/OSGeo4W/apps/msys/bin/sh
 
 set -e
@@ -8 +8 @@
 fi
 
-export OSGEO4W_ROOT_MSYS=/c/Programme/OSGeo4W
+export OSGEO4W_ROOT_MSYS=/c/OSGeo4W
 export PATH=.:/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem
 
@@ -65 +65 @@
 
 echo $(date): STARTING make
-make -j4 || make -j4
+make || make
 
 echo $(date): STARTING make install
@@ -81 +81 @@
 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)