summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--unix/Makefile.in4
-rw-r--r--win/Makefile.in4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 76ab4b3..185bbf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-18 Mo DeJong <mdejong@users.sourceforge.net>
+
+ * unix/Makefile.in:
+ * win/Makefile.in: Use $(MAKE) instead of make
+ in the tcltest rule.
+
2001-12-18 Don Porter <dgp@users.sourceforge.net>
* tests/event.test (event-click-drag-1.2): Corrected test that
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 0b01806..17d3198 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.58 2001/11/25 06:43:44 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.59 2001/12/19 07:45:52 mdejong Exp $
# Current Tk version; used in various names.
@@ -400,7 +400,7 @@ wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
# building tcltest in the Tcl bin directory. Just do it for them.
${TCL_BIN_DIR}/tcltest:
cd ${TCL_BIN_DIR} ; \
- make tcltest
+ $(MAKE) tcltest
tktest: ${TCL_BIN_DIR}/tcltest $(TKTEST_OBJS) $(TK_LIB_FILE)
${CC} $(LDFLAGS) $(TKTEST_OBJS) \
diff --git a/win/Makefile.in b/win/Makefile.in
index 946125f..958b347 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
# "autoconf" program (constructs like "@foo@" will get replaced in the
# actual Makefile.
#
-# RCS: @(#) $Id: Makefile.in,v 1.46 2001/11/25 06:43:44 mdejong Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.47 2001/12/19 07:45:52 mdejong Exp $
TCLVERSION = @TCL_VERSION@
VERSION = @TK_VERSION@
@@ -521,7 +521,7 @@ tktest : $(TKTEST)
# building tcltest in the Tcl bin directory. Just do it for them.
$(TCLTEST):
cd ${TCL_BIN_DIR} ; \
- make tcltest
+ $(MAKE) tcltest
$(TKTEST): $(TCLTEST) $(TK_LIB_FILE) $(TKTEST_OBJS) wish.$(RES) $(CAT32)
$(CC) $(CFLAGS) $(TKTEST_OBJS_NATIVE) $(TCL_LIB_FILE) \