From 050612f80d48c8a4a0b8c303eb21eb9a73a23ce6 Mon Sep 17 00:00:00 2001 From: apnadkarni Date: Thu, 25 Apr 2024 04:47:13 +0000 Subject: Fix building of libtclzip for out-of-source builds --- win/makefile.vc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/win/makefile.vc b/win/makefile.vc index 152fc1e..13b5396 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -464,7 +464,8 @@ TCLSTUBOBJS = \ TOMMATHDIR = $(ROOT)\libtommath PKGSDIR = $(ROOT)\pkgs -LIBTCLVFS = $(OUT_DIR)\libtcl.vfs +LIBTCLVFSSUBDIR = libtcl.vfs +LIBTCLVFS = $(OUT_DIR)\$(LIBTCLVFSSUBDIR) # Additional include and C macro definitions for the implicit rules # defined in rules.vc @@ -664,9 +665,10 @@ $(TCLSCRIPTZIP): $(TCLLIB) $(TCLSH) dlls @$(COPY) $(TCLDDELIB) "$(LIBTCLVFS)\tcl_library\dde @$(COPY) $(TCLREGLIB) "$(LIBTCLVFS)\tcl_library\registry !endif - @echo file delete -force {$@} > "$(OUT_DIR)\zipper.tcl" - @echo zipfs mkzip {$@} {$(LIBTCLVFS)} {$(LIBTCLVFS)} >> "$(OUT_DIR)\zipper.tcl" - @cd "$(OUT_DIR)" && $(TCLSH_NATIVE) zipper.tcl + @echo cd {$(OUT_DIR)} > "$(OUT_DIR)\zipper.tcl" + @echo file delete -force {$(@F)} >> "$(OUT_DIR)\zipper.tcl" + @echo zipfs mkzip {$(@F)} {$(LIBTCLVFSSUBDIR)} {$(LIBTCLVFSSUBDIR)} >> "$(OUT_DIR)\zipper.tcl" + @$(TCLSH_NATIVE) "$(OUT_DIR)/zipper.tcl" pkgs: @for /d %d in ($(PKGSDIR)\*) do \ -- cgit v0.12