summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-06 11:21:05 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-01-06 11:21:05 (GMT)
commit80d3b0d2ffd5551ba162df62f882dcdc18e4d30d (patch)
treeee7ac89d6452186f024dbd308ef39335dba8b183 /win/Makefile.in
parent3c4a5377c3aab16dd1aba24e71abcfe4994e18a3 (diff)
parent86b9cc18cdb1b06c9e34a429885a716f2c3e6a04 (diff)
downloadtcl-80d3b0d2ffd5551ba162df62f882dcdc18e4d30d.zip
tcl-80d3b0d2ffd5551ba162df62f882dcdc18e4d30d.tar.gz
tcl-80d3b0d2ffd5551ba162df62f882dcdc18e4d30d.tar.bz2
merge trunk
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index bbb1921..e5104f9 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -467,7 +467,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}; \