diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-15 15:01:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-15 15:01:20 (GMT) |
| commit | 8d5e51c1cdd4c12790e95a890fa2548ea216356c (patch) | |
| tree | 81a3c9c31f263cb80d5deb7144f48206ebb1f2f9 | |
| parent | f4c1bd71ddc7d3de18ed0b2650ea2127e8862d12 (diff) | |
| download | tk-8d5e51c1cdd4c12790e95a890fa2548ea216356c.zip tk-8d5e51c1cdd4c12790e95a890fa2548ea216356c.tar.gz tk-8d5e51c1cdd4c12790e95a890fa2548ea216356c.tar.bz2 | |
Fix windows build using --disable-shared
| -rw-r--r-- | win/Makefile.in | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index 836df4a..545fcab 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -690,7 +690,7 @@ $(CAT32): cat32.${OBJEXT} tkzipfile: ${TK_ZIP_FILE} ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} - @rm -rf ${TK_VFS_ROOT} + @$(RMDIR) ${TK_VFS_ROOT} @mkdir -p ${TK_VFS_PATH} @echo "creating ${TK_VFS_PATH} (prepare compression)" @( \ @@ -702,11 +702,12 @@ ${TK_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ) || ( \ $(COPY) -a $(TOP_DIR)/library/* ${TK_VFS_PATH}; \ ) - $(RMDIR) ${TCL_VFS_PATH}/demos - @if test "${ZIPFS_BUILD}" = "2" ; then \ + @$(RMDIR) $(TK_VFS_PATH)/demos + -@if test "${ZIPFS_BUILD}" = "2" ; then \ + cp ${BUILD_TCLSH}${EXESUFFIX} ${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 ${BUILD_TCLSH}s.exe ../${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}') 2>/dev/null || \ (echo '${NATIVE_ZIP}' | sed "s?^\./?$$(pwd)/?")`; \ |