summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2023-07-17 06:07:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2023-07-17 06:07:41 (GMT)
commitd93edc6670643b1c597e93b6310f44314e7a28d6 (patch)
tree65f3a82dd7e505c3ce567cb3072362cd64aa953d
parent7ac7933d135d021289b5a41697c7cf73f9e68ac2 (diff)
downloadtk-d93edc6670643b1c597e93b6310f44314e7a28d6.zip
tk-d93edc6670643b1c597e93b6310f44314e7a28d6.tar.gz
tk-d93edc6670643b1c597e93b6310f44314e7a28d6.tar.bz2
Proposed fix for [ec6f07231c]: Makefile.vc: error when TCLDIR is a relative pathcore-bug-ec6f07231c
-rw-r--r--win/makefile.vc6
1 files changed, 4 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 0fecad6..6da7500 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -522,7 +522,8 @@ $(TKSCRIPTZIP): .PHONY
@if not exist "$(LIBTKVFS)" $(MKDIR) "$(LIBTKVFS)"
@if exist "$(LIBTKVFS)\$(TKSCRIPTZIPTOP)" $(RMDIR) "$(LIBTKVFS)\$(TKSCRIPTZIPTOP)"
@$(CPYDIR) $(LIBDIR) "$(LIBTKVFS)\$(TKSCRIPTZIPTOP)"
- @cd "$(OUT_DIR)" && $(TCLSH) <<
+ @$(TCLSH) <<
+cd {$(OUT_DIR)}
file delete -force {$@}
zipfs mkzip {$@} {$(LIBTKVFS)} {$(LIBTKVFS)}
<<
@@ -531,7 +532,8 @@ zipfs mkzip {$@} {$(LIBTKVFS)} {$(LIBTKVFS)}
$(WISHSCRIPTZIP): $(TKSCRIPTZIP)
@echo Building Wish Tcl+Tk library zip file
@if exist "$(LIBTKVFS)\tcl_library" $(RMDIR) "$(LIBTKVFS)\tcl_library"
- @cd "$(OUT_DIR)" && $(TCLSH) <<
+ @$(TCLSH) <<
+cd {$(OUT_DIR)}
file delete -force {$@}
zipfs mount mnt "$(TCLSCRIPTZIP:\=/)"
file copy [file join [zipfs root] mnt tcl_library] "$(LIBTKVFS:\=/)"