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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-26 13:51:30 -0800 (Sat, 26 Dec 2015)
New Revision: 67387

Modified:
   grass/trunk/mswindows/osgeo4w/mklibs.sh
Log:
wingrass: attempt to fix mklibs.sh for X64

Modified: grass/trunk/mswindows/osgeo4w/mklibs.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/mklibs.sh	2015-12-26 17:09:30 UTC (rev 67386)
+++ grass/trunk/mswindows/osgeo4w/mklibs.sh	2015-12-26 21:51:30 UTC (rev 67387)
@@ -36,9 +36,9 @@
 
 	(cd $dlldir; dumpbin -exports $dllfile) |
 		sed -nf mswindows/osgeo4w/mklibs.sed |
-		egrep -v "^[ 	]*(_IMPORT_DESCRIPTOR_.*|_NULL_IMPORT_DESCRIPTOR)$" >mswindows/osgeo4w/vc/${defname%$VERSION}
+		egrep -v "^[	 ]*(_+IMPORT_DESCRIPTOR_.*|_+NULL_IMPORT_DESCRIPTOR)$" >mswindows/osgeo4w/vc/${defname%$VERSION}
 
 	(cd mswindows/osgeo4w/vc ;
-	    lib -nologo -def:${defname} -subsystem:windows -machine:${MACHINE} ;
+	    lib -nologo -def:${defname} -subsystem:windows -machine:${MACHINE}
 	    lib -nologo $libname || exit)
 done