summaryrefslogtreecommitdiffstats
path: root/win/Makefile.in
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2008-12-20 16:32:31 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2008-12-20 16:32:31 (GMT)
commit1695e34e719dc813bd409db3246f48ec3dc164ac (patch)
treef9ed68e18c0fea7e2e0dc14608acdcb5dd1a8ebc /win/Makefile.in
parent57177ff58ba2937f00a929c15e0721439ed5a8ec (diff)
downloadtcl-1695e34e719dc813bd409db3246f48ec3dc164ac.zip
tcl-1695e34e719dc813bd409db3246f48ec3dc164ac.tar.gz
tcl-1695e34e719dc813bd409db3246f48ec3dc164ac.tar.bz2
Minor updates to make building work better with msys on Windows.
(Apparently the gcc used doesn't like a / at the end of a -I argument...)
Diffstat (limited to 'win/Makefile.in')
-rw-r--r--win/Makefile.in10
1 files changed, 5 insertions, 5 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index eb5cd65..78995e6 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.143 2008/12/19 10:55:38 dkf Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.144 2008/12/20 16:32:32 dkf Exp $
VERSION = @TCL_VERSION@
@@ -101,7 +101,7 @@ TOMMATH_DIR = $(TOP_DIR)/libtommath
WIN_DIR = $(TOP_DIR)/win
COMPAT_DIR = $(TOP_DIR)/compat
PKGS_DIR = $(TOP_DIR)/pkgs
-ZLIB_DIR = $(COMPAT_DIR)/zlib/
+ZLIB_DIR = $(COMPAT_DIR)/zlib
# Converts a POSIX path to a Windows native path.
CYGPATH = @CYGPATH@
@@ -196,7 +196,7 @@ ${COMPILE_DEBUG_FLAGS}
ZLIB_LIB = libz.a
ZLIB_INC = -I"${ZLIB_DIR}"
-ZLIB_FILE = ${ZLIB_DIR}${ZLIB_LIB}
+ZLIB_FILE = "${ZLIB_DIR}/${ZLIB_LIB}"
CC_OBJNAME = @CC_OBJNAME@
CC_EXENAME = @CC_EXENAME@
@@ -434,7 +434,7 @@ ${TCL_LIB_FILE}: ${TCL_OBJS} ${ZLIB_FILE}
# assume GNU make
${ZLIB_FILE}:
- ${MAKE} -C ${ZLIB_DIR} CC="${CC}" ${ZLIB_LIB}
+ ${MAKE} -C "${ZLIB_DIR}" CC="${CC}" ${ZLIB_LIB}
${DDE_DLL_FILE}: ${DDE_OBJS} ${TCL_STUB_LIB_FILE}
@$(RM) ${DDE_DLL_FILE}
@@ -746,7 +746,7 @@ clean: cleanhelp clean-packages
$(RM) *.lib *.a *.exp *.dll *.$(RES) *.${OBJEXT} *~ \#* TAGS a.out
$(RM) $(TCLSH) $(TCLTEST) $(CAT32)
$(RM) *.pch *.ilk *.pdb
- ${MAKE} -C ${ZLIB_DIR} clean
+ ${MAKE} -C "${ZLIB_DIR}" clean
distclean: distclean-packages clean
$(RM) Makefile config.status config.cache config.log tclConfig.sh \