summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorhobbs <hobbs>2000-05-19 18:57:59 (GMT)
committerhobbs <hobbs>2000-05-19 18:57:59 (GMT)
commitf7b89504bf385e5b1901c3ca9b75b5241e31ca21 (patch)
treeb30933cf753d9f13cf186f2637d06da777a93450 /win
parentb18b0c87fd558e2ac08afee5f57cf63d26e8616c (diff)
downloadtcl-f7b89504bf385e5b1901c3ca9b75b5241e31ca21.zip
tcl-f7b89504bf385e5b1901c3ca9b75b5241e31ca21.tar.gz
tcl-f7b89504bf385e5b1901c3ca9b75b5241e31ca21.tar.bz2
fixed patching problems for mingw compatability
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in4
-rw-r--r--win/tcl.m454
2 files changed, 29 insertions, 29 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 0f68d1d..c2a66b6 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.35 2000/05/18 22:19:17 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.36 2000/05/19 18:57:59 hobbs Exp $
VERSION = @TCL_VERSION@
@@ -319,7 +319,7 @@ $(TCLSH): $(TCL_LIB_FILE) $(TCLSH_OBJS) tclsh.$(RES)
$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME)
-$(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32) tclsh.res
+$(TCLTEST): $(TCL_LIB_FILE) $(TCLTEST_OBJS) $(CAT32) tclsh.$(RES)
$(CC) $(CFLAGS) $(TCLTEST_OBJS) $(TCL_LIB_FILE) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME)
diff --git a/win/tcl.m4 b/win/tcl.m4
index b76f456..798d6b0 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -336,34 +336,34 @@ AC_DEFUN(SC_ENABLE_SYMBOLS, [
# Results:
#
# Defines the following vars for all compilers:
-# EXTRA_CFLAGS
-# CFLAGS_DEBUG
-# CFLAGS_OPTIMIZE
-# CFLAGS_WARNING
-# LDFLAGS_DEBUG
-# LDFLAGS_OPTIMIZE
-# LDFLAGS_CONSOLE
-# LDFLAGS_WINDOW
-# CC_OBJNAME
-# CC_EXENAME
-# PATHTYPE
-# VPSEP
-# CYGPATH
+# EXTRA_CFLAGS
+# CFLAGS_DEBUG
+# CFLAGS_OPTIMIZE
+# CFLAGS_WARNING
+# LDFLAGS_DEBUG
+# LDFLAGS_OPTIMIZE
+# LDFLAGS_CONSOLE
+# LDFLAGS_WINDOW
+# CC_OBJNAME
+# CC_EXENAME
+# PATHTYPE
+# VPSEP
+# CYGPATH
#
# Defines the following vars for non-gcc compilers
-# SHLIB_LD
-# SHLIB_LD_LIBS
-# LIBS
-# AR
-# MAKE_LIB
-# MAKE_EXE
-# MAKE_DLL
-#
-# LIBSUFFIX
-# LIBPREFIX
-# LIBRARIES
-# EXESUFFIX
-# DLLSUFFIX
+# SHLIB_LD
+# SHLIB_LD_LIBS
+# LIBS
+# AR
+# MAKE_LIB
+# MAKE_EXE
+# MAKE_DLL
+#
+# LIBSUFFIX
+# LIBPREFIX
+# LIBRARIES
+# EXESUFFIX
+# DLLSUFFIX
#
#--------------------------------------------------------------------
@@ -388,7 +388,7 @@ AC_DEFUN(SC_CONFIG_CFLAGS, [
RC_TYPE=
RC_INCLUDE=--include
RES=res.o
- MAKE_LIB="\${AR} crv \[$]@"
+ MAKE_LIB="\${AR} crv \[$]@"
POST_MAKE_LIB="\${RANLIB} \[$]@"
MAKE_EXE="\${CC} -o \[$]@"
LIBPREFIX="lib"