summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhypnotoad <yoda@etoyoc.com>2014-09-01 09:41:09 (GMT)
committerhypnotoad <yoda@etoyoc.com>2014-09-01 09:41:09 (GMT)
commit08cea7b3c1d39f8414dbe26441e414c32fe234ea (patch)
tree313cef69647a7b140068a65b5e3c307d4c064c82
parent57e9563dcad705ad4fb3c19ecae2673ed8c06219 (diff)
downloadtcl-08cea7b3c1d39f8414dbe26441e414c32fe234ea.zip
tcl-08cea7b3c1d39f8414dbe26441e414c32fe234ea.tar.gz
tcl-08cea7b3c1d39f8414dbe26441e414c32fe234ea.tar.bz2
Tweaks to the Windows makefile.
-rw-r--r--win/Makefile.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index b883e8a..07c8db1 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -424,14 +424,16 @@ $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
@VC_MANIFEST_EMBED_EXE@
-$(TCLKIT): $(TCLSH_OBJS) @LIBRARIES@ ${TCL_OBJS} tclsh.$(RES)
+tclkit: $(TCLKIT)
+
+$(TCLKIT): $(TCLSH_OBJS) @LIBRARIES@ ${TCL_OBJS} $(CAT32) tclsh.$(RES)
$(CC) $(CFLAGS) ${TCL_OBJS} $(TCLSH_OBJS) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
PWD=`pwd`
rm -f tclkit.zip
cp $(TCLSH) $(TCLKIT)
- cd $(SCRIPT_INSTALL_DIR) ; zip -rAq ${PWD}/tclkit.zip tcl8 tcl8.6
- $(CAT32) tclkit.zip >> $(TCLKIT)
+ cd ${prefix}/lib ; zip -rq ${PWD}/tclkit.zip tcl8 tcl8.6
+ cat tclkit.zip >> $(TCLKIT)
cat32.$(OBJEXT): cat.c
$(CC) -c $(CC_SWITCHES) @DEPARG@ $(CC_OBJNAME)
@@ -878,6 +880,6 @@ html-tk: $(TCLSH)
.PHONY: install-doc install-private-headers test test-tcl runtest shell
.PHONY: gdb depend cleanhelp clean distclean packages install-packages
.PHONY: test-packages clean-packages distclean-packages genstubs html
-.PHONY: html-tcl html-tk
+.PHONY: html-tcl html-tk tclkit
# DO NOT DELETE THIS LINE -- make depend depends on it.