summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-06 11:15:20 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-06 11:15:20 (GMT)
commit86b9cc18cdb1b06c9e34a429885a716f2c3e6a04 (patch)
tree990287a705cc49f7ace38afe8fd3eaa313ea5817
parent97e52f918d3e35ec3f61e099424ccf966aae3101 (diff)
downloadtcl-86b9cc18cdb1b06c9e34a429885a716f2c3e6a04.zip
tcl-86b9cc18cdb1b06c9e34a429885a716f2c3e6a04.tar.gz
tcl-86b9cc18cdb1b06c9e34a429885a716f2c3e6a04.tar.bz2
Fix win32 mingw 32-bit build, bug was introduced by [c397433be321e6d9] (wrong zlib1.dll was copied)
-rw-r--r--win/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 7e6486c..2d27a41 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -468,7 +468,7 @@ ${TEST_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${TCLTEST_OBJS}
# use pre-built zlib1.dll
${ZLIB_DLL_FILE}: ${TCL_STUB_LIB_FILE}
- @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR}/win32/zdll.libset" ; then \
+ @if test "@ZLIB_LIBS@set" != "${ZLIB_DIR_NATIVE}/win32/zdll.libset" ; then \
$(COPY) $(ZLIB_DIR)/win64/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \
else \
$(COPY) $(ZLIB_DIR)/win32/${ZLIB_DLL_FILE} ${ZLIB_DLL_FILE}; \