summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-04 13:11:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-04 13:11:37 (GMT)
commita5463cbb6f112f14d0ce2a89e41e97b9f4003bbb (patch)
tree35cac6ea27c8e067614a3690742a34c02166d725 /win
parent50c4ef6fc16b4ddb9ed390310c04c15a2f3ea593 (diff)
downloadtcl-a5463cbb6f112f14d0ce2a89e41e97b9f4003bbb.zip
tcl-a5463cbb6f112f14d0ce2a89e41e97b9f4003bbb.tar.gz
tcl-a5463cbb6f112f14d0ce2a89e41e97b9f4003bbb.tar.bz2
In a --disable-shared build, attach the zip-file to the executable, so "onfiledist.yml" doesn't need to do that any more
Diffstat (limited to 'win')
-rw-r--r--win/Makefile.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/win/Makefile.in b/win/Makefile.in
index 1412016..5706b08 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -545,11 +545,16 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE}
echo "${TCL_ZIP_FILE} successful created with $$zip" && \
cd ..)
-$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
+$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) ${TCL_ZIP_FILE}
$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
$(COPY) tclsh.exe.manifest $(TCLSH).manifest
@VC_MANIFEST_EMBED_EXE@
+ @if test "${ZIPFS_BUILD}" = "2" ; then \
+ cat ${TCL_ZIP_FILE} >> ${TCLSH}; \
+ ${NATIVE_ZIP} -A ${TCLSH} \
+ || echo 'ignore zip-error by adjust sfx process (not executable?)'; \
+ fi
cat32.$(OBJEXT): cat.c
$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)