summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-18 22:47:57 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-18 22:47:57 (GMT)
commit305acd89586e2afff8b589ecdbac4865a210b5c1 (patch)
tree03be664fd0630636df5ad85ce27220d584e5299e
parentfc3bc1654b05755254916cc7c530af24641a9519 (diff)
downloadtcl-305acd89586e2afff8b589ecdbac4865a210b5c1.zip
tcl-305acd89586e2afff8b589ecdbac4865a210b5c1.tar.gz
tcl-305acd89586e2afff8b589ecdbac4865a210b5c1.tar.bz2
Corrections to make things work with msys
-rw-r--r--win/Makefile.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 700af1f..0a14f8e 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "./configure", which is a configuration script generated by the "autoconf"
# program (constructs like "@foo@" will get replaced in the actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.140 2008/12/18 15:36:45 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.141 2008/12/18 22:47:57 dkf Exp $
VERSION = @TCL_VERSION@
@@ -99,7 +99,7 @@ GENERIC_DIR = @srcdir@/../generic
TOMMATH_DIR = @srcdir@/../libtommath
WIN_DIR = @srcdir@
COMPAT_DIR = @srcdir@/../compat
-ZLIB_DIR = $(COMPAT_DIR)/zlib
+ZLIB_DIR = $(COMPAT_DIR)/zlib/
# Converts a POSIX path to a Windows native path.
CYGPATH = @CYGPATH@
@@ -429,7 +429,7 @@ ${TCL_LIB_FILE}: ${TCL_OBJS} ${ZLIB_DIR}${ZLIB_LIB}
# assume GNU make
${ZLIB_DIR}${ZLIB_LIB}:
- ${MAKE} -C ${ZLIB_DIR} ${ZLIB_LIB}
+ ${MAKE} -C ${ZLIB_DIR} CC="${CC}" ${ZLIB_LIB}
${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE}
@$(RM) ${DDE_DLL_FILE}