Browse Source

update packages.sh for grass7

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@45485 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 years ago
parent
commit
07ba99417a
1 changed files with 3 additions and 2 deletions
  1. 3 2
      mswindows/osgeo4w/package.sh

+ 3 - 2
mswindows/osgeo4w/package.sh

@@ -87,7 +87,7 @@ cp -uv $OSGEO4W_ROOT_MSYS/lib/zlib.lib mswindows/osgeo4w/lib/libz.a
 
 
 if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 
 
-	if [ -e include/Make/Grass.make ] ; then
+	if [ -e include/Make/Platform.make ] ; then
 	    log make distclean
 	    log make distclean
 	    make distclean
 	    make distclean
 	fi
 	fi
@@ -117,7 +117,8 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 		--with-regex \
 		--with-regex \
 		--with-nls \
 		--with-nls \
 		--with-freetype-includes=$OSGEO4W_ROOT_MSYS/include/freetype2 \
 		--with-freetype-includes=$OSGEO4W_ROOT_MSYS/include/freetype2 \
-		--with-odbc
+		--with-odbc \
+	        --without-cairo
 
 
 	touch mswindows/osgeo4w/configure-stamp
 	touch mswindows/osgeo4w/configure-stamp
 fi
 fi