diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 08:13:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-12 08:13:35 (GMT) |
| commit | 5d6c8b7a50f680c200d19ecb11ab08c90416eec8 (patch) | |
| tree | d1f6e3732829c4598466e332a0976c0eff2e428c /unix/Makefile.in | |
| parent | 565102f5047086fc26e91321f457e0e14949c458 (diff) | |
| download | tk-5d6c8b7a50f680c200d19ecb11ab08c90416eec8.zip tk-5d6c8b7a50f680c200d19ecb11ab08c90416eec8.tar.gz tk-5d6c8b7a50f680c200d19ecb11ab08c90416eec8.tar.bz2 | |
Better job of locating the tclsh binary (to be unzipped for --disable-shared). Also, don't abort build when it fails
Diffstat (limited to 'unix/Makefile.in')
| -rw-r--r-- | unix/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 6f75076..b830c4e 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -112,7 +112,7 @@ TCL_PLATFORM_DIR = $(TCLDIR)/unix # for this version of Tk: TCL_BIN_DIR = @TCL_BIN_DIR@ -# The linker flags needed to link in the Tcl library (ex: -ltcl8.2) +# The linker flags needed to link in the Tcl library (ex: -ltcl8.7) TCL_LIB_FLAG = @TCL_LIB_FLAG@ # Flag, 1: we're building a shared lib, 0 we're not @@ -619,10 +619,10 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} rm -rf ${TK_VFS_PATH}/demos @find ${TK_VFS_ROOT} -type d -empty -delete @echo "creating ${TK_ZIP_FILE} from ${TK_VFS_PATH}" - @if test "${ZIPFS_BUILD}" = "2" ; then \ + -@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} ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \ + cd ${TK_VFS_ROOT} && cp ${TCL_BIN_DIR}/../bin/tclsh${TCLVERSION} ../${TK_ZIP_FILE} && $$zip -J ../${TK_ZIP_FILE}) \ fi @(zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}' || \ echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?") 2>/dev/null`; \ |