[tor-commits] [torbrowser/maint-2.2] Fix Zlib's prefix. We now use the sane option.

[erinn at torproject.org]

commit dc1c8b67fc6142b2e00f51715cf3f8f7939b7ae3
Author: Shondoit Walker <shondoit at gmail.com>
Date:   Sat May 12 23:01:25 2012 +0200

    Fix Zlib's prefix. We now use the sane option.
---
 build-scripts/windows.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index e6d55b0..0a80f91 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -56,10 +56,10 @@ TBB_FINAL=$(BUILT_DIR)/tbbwin-alpha-dist
 ## Include versions (must happen after variable definitions above
 include $(PWD)/versions.mk
 
+ZLIB_OPTS=prefix="$(BUILT_DIR)" BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib"
 build-zlib: $(ZLIB_DIR)
-	cd $(ZLIB_DIR) && sed -i -e "s%prefix = /usr/local%prefix = ${BUILT_DIR}%" win32/Makefile.gcc
 	cd $(ZLIB_DIR) && LDFLAGS="-Wl,--nxcompat -Wl,--dynamicbase" make -f win32/Makefile.gcc -j $(NUM_CORES)
-	cd $(ZLIB_DIR) && BINARY_PATH="$(BUILT_DIR)/bin" INCLUDE_PATH="$(BUILT_DIR)/include" LIBRARY_PATH="$(BUILT_DIR)/lib" make -f win32/Makefile.gcc install
+	cd $(ZLIB_DIR) && $(ZLIB_OPTS) make -f win32/Makefile.gcc install
 	touch $(STAMP_DIR)/build-zlib
 
 OPENSSL_OPTS=-no-idea -no-rc5 -no-md2 shared zlib --prefix=$(BUILT_DIR) --openssldir=$(BUILT_DIR) -L$(BUILT_DIR)/lib -Wl,--nxcompat -Wl,--dynamicbase -I$(BUILT_DIR)/include