diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-11-23 21:00:57 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-11-23 21:00:57 (GMT) |
| commit | b5ef06c920a95ab648db912a6c6e2f1350ecac70 (patch) | |
| tree | 461549286627e280279d96538d5e6f465a28178c | |
| parent | 1f8d9b37a0edbbcbb1cdcbd2d8c3d55dc597e6b1 (diff) | |
| parent | d1e9efc1de9cabf20f451a1a214fcc527cb84257 (diff) | |
| download | tcl-b5ef06c920a95ab648db912a6c6e2f1350ecac70.zip tcl-b5ef06c920a95ab648db912a6c6e2f1350ecac70.tar.gz tcl-b5ef06c920a95ab648db912a6c6e2f1350ecac70.tar.bz2 | |
merge 8.7
| -rw-r--r-- | unix/Makefile.in | 7 | ||||
| -rw-r--r-- | win/Makefile.in | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 7b7a19f..84bb582 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -683,8 +683,11 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} cp -a $(TOP_DIR)/library/* ${TCL_VFS_PATH} cp -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl find ${TCL_VFS_ROOT} -type d -empty -delete - (zip=`readlink -m '${NATIVE_ZIP}'`; cd ${TCL_VFS_ROOT} && \ - $$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && cd ..) + (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ + (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ + cd ${TCL_VFS_ROOT} && \ + $$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && \ + cd ..) # The following target is configured by autoconf to generate either a shared # library or non-shared library for Tcl. diff --git a/win/Makefile.in b/win/Makefile.in index 58c52bb..1fd7b7a 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -490,7 +490,9 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE} $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl $(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde $(COPY) ${REG_DLL_FILE} ${TCL_VFS_PATH}/reg - (zip=`readlink -m '${NATIVE_ZIP}'`; cd ${TCL_VFS_ROOT} && \ + (zip=`(realpath '${NATIVE_ZIP}' || readlink -m '${NATIVE_ZIP}') 2>/dev/null || \ + (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ + cd ${TCL_VFS_ROOT} && \ $$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && \ cd ..) |