gnumeric r16797 - trunk/tools/win32

[jody svn gnome org]

Author: jody
Date: Sun Sep 14 13:32:18 2008
New Revision: 16797
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16797&view=rev

Log:
clean up unnecessary zlib tweakage

Modified:
   trunk/tools/win32/jhbuildrc

Modified: trunk/tools/win32/jhbuildrc
==============================================================================
--- trunk/tools/win32/jhbuildrc	(original)
+++ trunk/tools/win32/jhbuildrc	Sun Sep 14 13:32:18 2008
@@ -56,7 +56,7 @@
 os.environ['ACLOCAL_AMFLAGS'] = ' -I '+prefix+'/share/aclocal'	# for libgnomedb
 
 os.environ['WINEDEBUG']	 = '-all'
-os.environ['MAKE']	 = 'colormake'
+#os.environ['MAKE']	 = 'colormake'
 
 py_prefix = prefix+'/Python25'
 os.environ['PYTHON']	 = py_prefix+'/python.exe'
@@ -80,7 +80,7 @@
 	autogenargs += ' '+tool+'="'+os.environ[tool]+'" '
 
 #Module specific configure arguments
-module_autogenargs['zlib']    = autogenargs + ' --prefix='+prefix+' --shared'
+module_autogenargs['zlib']    = autogenargs
 module_autogenargs['pcre']    = autogenargs + ' --enable-utf8' + ' --enable-shared'
 module_autogenargs['gettext'] = autogenargs + """ --without-emacs \
 						  --disable-libasprintf \