[GRASS-SVN] r67021 - grass/trunk/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-05 07:06:56 -0800 (Sat, 05 Dec 2015)
New Revision: 67021

Modified:
   grass/trunk/mswindows/osgeo4w/package.sh
Log:
wingrass: fix compilation issue with proj4 4.9 (avoid hacking Platform.make)

Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh	2015-12-05 14:51:04 UTC (rev 67020)
+++ grass/trunk/mswindows/osgeo4w/package.sh	2015-12-05 15:06:56 UTC (rev 67021)
@@ -96,7 +96,7 @@
 
 [ -d mswindows/osgeo4w/lib ] || mkdir mswindows/osgeo4w/lib 
 cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/libsqlite3.a 
-cp -uv $OSGEO4W_ROOT_MSYS/lib/proj_i.lib mswindows/osgeo4w/lib/libproj_i.a 
+cp -uv $OSGEO4W_ROOT_MSYS/lib/proj_i.lib mswindows/osgeo4w/lib/libproj.a 
 cp -uv $OSGEO4W_ROOT_MSYS/lib/libtiff_i.lib mswindows/osgeo4w/lib/libtiff.a 
 cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.a 
 cp -uv $OSGEO4W_ROOT_MSYS/lib/jpeg_i.lib mswindows/osgeo4w/lib/libjpeg.a 
@@ -114,7 +114,7 @@
 
 	log configure
 	./configure \
-		--with-libs="$OSGEO4W_ROOT_MSYS/lib $OSGEO4W_ROOT_MSYS/apps/msys/lib $PWD/mswindows/osgeo4w/lib" \
+		--with-libs="$PWD/mswindows/osgeo4w/lib $OSGEO4W_ROOT_MSYS/lib $OSGEO4W_ROOT_MSYS/apps/msys/lib" \
 		--with-includes="$OSGEO4W_ROOT_MSYS/include $OSGEO4W_ROOT_MSYS/apps/msys/include" \
 		--libexecdir=$OSGEO4W_ROOT_MSYS/bin \
 		--prefix=$OSGEO4W_ROOT_MSYS/apps/grass \
@@ -140,12 +140,6 @@
 	        --with-cairo \
 		--with-cairo-includes=$OSGEO4W_ROOT_MSYS/include/cairo \
                 --with-postgres
-
-	# fix Proj4 4.9 compilation issues (workaround - better solution must be found)
-	proj_libs=`$PWD/mswindows/osgeo4w/proj4-config --libs`
-	sed -e "s#-lproj#${proj_libs}#g" \
-	    include/Make/Platform.make > include/Make/Platform.make.new
-	mv include/Make/Platform.make.new include/Make/Platform.make
 	
 	touch mswindows/osgeo4w/configure-stamp
 fi