summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhypnotoad <yoda@etoyoc.com>2014-09-03 20:41:12 (GMT)
committerhypnotoad <yoda@etoyoc.com>2014-09-03 20:41:12 (GMT)
commitcefb8b148004b24b824e959c03d73f5a6800001b (patch)
tree6b667a8ef5581e56965a2ec13a239be6216cc609
parent55a3852cc239fae1a240b94f46fe5d77e96849cc (diff)
downloadtcl-cefb8b148004b24b824e959c03d73f5a6800001b.zip
tcl-cefb8b148004b24b824e959c03d73f5a6800001b.tar.gz
tcl-cefb8b148004b24b824e959c03d73f5a6800001b.tar.bz2
More tweaks to makefiles
-rw-r--r--unix/Makefile.in1
-rw-r--r--win/Makefile.in13
2 files changed, 8 insertions, 6 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 8f260d0..f9d713d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -654,7 +654,6 @@ null.zip:
zip null.zip .empty
${TCLKIT_EXE}: ${TCL_EXE} null.zip
- rm -f tclkit.zip
PWD=`pwd`
cp -f ${TCL_EXE} ${TCLKIT_EXE}
cat null.zip >> ${TCLKIT_EXE}
diff --git a/win/Makefile.in b/win/Makefile.in
index f302ed6..d99e204 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -426,12 +426,15 @@ $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
tclkit: $(TCLKIT)
-$(TCLKIT): $(TCLSH)
- rm -f tclkit.zip
+null.zip:
+ touch .empty
+ zip null.zip .empty
+
+$(TCLKIT): $(TCLSH) null.zip
PWD=`pwd`
- cd ${prefix}/lib ; zip -rq ${PWD}/tclkit.zip tcl8 tcl8.6
- cp -f $(TCLSH) $(TCLKIT)
- cat tclkit.zip >> $(TCLKIT)
+ cp -f $(WISH) $(TCLKIT)
+ cat null.zip >> $(TCLKIT)
+ cd ${prefix}/lib ; zip -rAq ${PWD}/$(TCLKIT) tcl8 tcl8.6
cat32.$(OBJEXT): cat.c
$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)