diff options
author | apnadkarni <apnmbx-wits@yahoo.com> | 2024-04-25 04:47:13 (GMT) |
---|---|---|
committer | apnadkarni <apnmbx-wits@yahoo.com> | 2024-04-25 04:47:13 (GMT) |
commit | 1e484de3935e3dd6350bc760493726e214b1298c (patch) | |
tree | 3526197d6818f6c7ccee329176bad71cb9d6e5a2 | |
parent | 66678f13b57fb2f9068cf2ebe6273e7ec667d792 (diff) | |
download | tcl-1e484de3935e3dd6350bc760493726e214b1298c.zip tcl-1e484de3935e3dd6350bc760493726e214b1298c.tar.gz tcl-1e484de3935e3dd6350bc760493726e214b1298c.tar.bz2 |
Fix building of libtclzip for out-of-source builds
-rw-r--r-- | win/makefile.vc | 10 |
1 files 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 \
|