diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-04 14:17:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-04 14:17:53 (GMT) |
| commit | 27253ccc60a0bf0945eab59d096583087f88d92e (patch) | |
| tree | 4372da232679abbfd355d5ce189991389f73fd42 /win/Makefile.in | |
| parent | c0618ccae6d401eddf4d6789789b055f750fcc1f (diff) | |
| parent | 35166b815b524f015c27c908257e19e12c0686e1 (diff) | |
| download | tk-27253ccc60a0bf0945eab59d096583087f88d92e.zip tk-27253ccc60a0bf0945eab59d096583087f88d92e.tar.gz tk-27253ccc60a0bf0945eab59d096583087f88d92e.tar.bz2 | |
Merge 8.7. Make a --disable-shared build handle the Tk zip file.
Diffstat (limited to 'win/Makefile.in')
| -rw-r--r-- | win/Makefile.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index a02dbc2..bdbbdcf 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -656,11 +656,16 @@ install-private-headers: libraries $(INSTALL_DATA) $$i $(PRIVATE_INCLUDE_INSTALL_DIR); \ done; -$(WISH): $(WISH_OBJS) @LIBRARIES@ $(TK_STUB_LIB_FILE) wish.$(RES) +$(WISH): $(WISH_OBJS) @LIBRARIES@ $(TK_STUB_LIB_FILE) wish.$(RES) ${TK_ZIP_FILE} $(CC) $(CFLAGS) $(WISH_OBJS) $(TK_LIB_FILE) \ $(TK_STUB_LIB_FILE) $(TCL_LIB_FILE) $(LIBS) \ wish.$(RES) $(CC_EXENAME) $(LDFLAGS_WINDOW) @VC_MANIFEST_EMBED_EXE@ + @if test "${ZIPFS_BUILD}" = "2" ; then \ + cat ${TK_ZIP_FILE} >> ${WISH}; \ + ${NATIVE_ZIP} -A ${WISH} \ + || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ + fi tktest: $(TKTEST) @@ -697,6 +702,11 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ) || ( \ $(COPY) -a $(TOP_DIR)/library/* ${TK_VFS_PATH}; \ ) + @if test "${ZIPFS_BUILD}" = "2" ; then \ + (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ + (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ + cd ${TK_VFS_ROOT} && cp ${BUILD_TCLSH}s.exe ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \ + fi (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ cd ${TK_VFS_ROOT} && \ @@ -792,7 +802,8 @@ cleanhelp: clean: cleanhelp $(RM) *.lib *.a *.exp *.dll *.res *.${OBJEXT} *~ \#* TAGS a.out $(RM) $(WISH) $(TKTEST) $(CAT32) - $(RM) *.pch *.ilk *.pdb + $(RM) *.pch *.ilk *.pdb *.zip + $(RMDIR) *.vfs distclean: clean $(RM) Makefile config.status config.cache config.log tkConfig.sh \ |