diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-04 13:15:00 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-04 13:15:00 (GMT) |
| commit | d8863bf90c39aac1110191933f13ee9b9bf8d532 (patch) | |
| tree | 4c00314fef6a4b84789987759456e0f2b66d9878 /unix | |
| parent | b16a5a900917cb28a44b7cee5a7252b4ab5a8253 (diff) | |
| parent | c09ddd48e3db315912a6c3797f37c0a49a2dfb6d (diff) | |
| download | tcl-d8863bf90c39aac1110191933f13ee9b9bf8d532.zip tcl-d8863bf90c39aac1110191933f13ee9b9bf8d532.tar.gz tcl-d8863bf90c39aac1110191933f13ee9b9bf8d532.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index e98b586..418490c 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -814,10 +814,15 @@ tclLibObjs: # This targets actually build the objects needed for the lib in the above case objs: ${OBJS} -${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} +${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} ${TCL_ZIP_FILE} ${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} \ @TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \ ${CC_SEARCH_FLAGS} -o ${TCL_EXE} + @if test "${ZIPFS_BUILD}" = "2" ; then \ + cat ${TCL_ZIP_FILE} >> ${TCL_EXE}; \ + ${NATIVE_ZIP} -A ${TCL_EXE} \ + || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ + fi # Must be empty so it doesn't conflict with rule for ${TCL_EXE} above ${NATIVE_TCLSH}: |