diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-15 14:36:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-15 14:36:51 (GMT) |
| commit | f4c1bd71ddc7d3de18ed0b2650ea2127e8862d12 (patch) | |
| tree | a25e8e6b1c3cacbd8ac29053024fe1e08174673b /unix | |
| parent | e90980a42a9d7125c6d1c04f30b78a9b4b53b53c (diff) | |
| download | tk-f4c1bd71ddc7d3de18ed0b2650ea2127e8862d12.zip tk-f4c1bd71ddc7d3de18ed0b2650ea2127e8862d12.tar.gz tk-f4c1bd71ddc7d3de18ed0b2650ea2127e8862d12.tar.bz2 | |
Use "macher" utility in stead of append on MacOSX, just as Tcl does
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c7e52bd..a543466 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -620,9 +620,10 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} @find ${TK_VFS_ROOT} -type d -empty -delete @echo "creating ${TK_ZIP_FILE} from ${TK_VFS_PATH}" -@if test "${ZIPFS_BUILD}" = "2" ; then \ + cp ${TCL_BIN_DIR}/tclsh ${TK_VFS_ROOT}/../${TK_ZIP_FILE} || cp ${TCL_BIN_DIR}/../bin/tclsh${TCLVERSION} ${TK_VFS_ROOT}/../${TK_ZIP_FILE}; \ (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ - cd ${TK_VFS_ROOT} && cp ${TCL_BIN_DIR}/../bin/tclsh${TCLVERSION} ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \ + cd ${TK_VFS_ROOT} && $$zip -J ../${TK_ZIP_FILE}) \ fi @(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}' || \ echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?") 2>/dev/null`; \ @@ -636,7 +637,11 @@ ${LIB_FILE}: ${STUB_LIB_FILE} @LIB_RSRC_FILE@ ${OBJS} ${TK_ZIP_FILE} rm -f $@ @MAKE_LIB@ @if test "${ZIPFS_BUILD}" = "1" ; then \ + if test "x$(MACHER)" = "x" ; then \ cat ${TK_ZIP_FILE} >> ${LIB_FILE}; \ + else $(MACHER) append ${LIB_FILE} ${TK_ZIP_FILE} /tmp/macher_output; \ + mv /tmp/macher_output ${LIB_FILE}; chmod u+x ${LIB_FILE}; \ + fi; \ ${NATIVE_ZIP} -A ${LIB_FILE} \ || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi @@ -675,6 +680,11 @@ ${WISH_EXE}: $(TK_STUB_LIB_FILE) $(WISH_OBJS) $(TK_LIB_FILE) @APP_RSRC_FILE@ $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o ${WISH_EXE} @if test "${ZIPFS_BUILD}" = "2" ; then \ cat ${TK_ZIP_FILE} >> ${WISH_EXE}; \ + if test "x$(MACHER)" = "x" ; then \ + cat ${TK_ZIP_FILE} >> ${WISH_EXE}; \ + else $(MACHER) append ${WISH_EXE} ${TK_ZIP_FILE} /tmp/macher_output; \ + mv /tmp/macher_output ${LIB_FILE}; chmod u+x ${LIB_FILE}; \ + fi; \ ${NATIVE_ZIP} -A ${WISH_EXE} \ || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi |