diff options
| author | apnadkarni <apnmbx-wits@yahoo.com> | 2023-10-09 12:34:35 (GMT) |
|---|---|---|
| committer | apnadkarni <apnmbx-wits@yahoo.com> | 2023-10-09 12:34:35 (GMT) |
| commit | f301725033aa2778011120e89174f0015fab390c (patch) | |
| tree | 4619705de29552f86169271bc63dae3518bbc736 /win | |
| parent | 591e2960990556d5ef14acf93529129a16b5a8a6 (diff) | |
| parent | 91aa048608372b72942541932b0feaa02cc36f80 (diff) | |
| download | tcl-f301725033aa2778011120e89174f0015fab390c.zip tcl-f301725033aa2778011120e89174f0015fab390c.tar.gz tcl-f301725033aa2778011120e89174f0015fab390c.tar.bz2 | |
Merge 8.7 - unix test builds
Diffstat (limited to 'win')
| -rw-r--r-- | win/Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/win/Makefile.in b/win/Makefile.in index b9a6d6f..877c4f3 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -126,10 +126,6 @@ ZLIB_DIR_NATIVE = $(shell $(CYGPATH) '$(ZLIB_DIR)') MINIZIP_DIR_NATIVE = $(shell $(CYGPATH) '$(MINIZIP_DIR)') TOMMATH_DIR_NATIVE = $(shell $(CYGPATH) '$(TOMMATH_DIR)') -# Fully qualify library path so that `make test` -# does not depend on the current directory. -LIBRARY_DIR1 = $(shell cd '$(ROOT_DIR_NATIVE)/library' ; pwd -P) -LIBRARY_DIR = $(shell $(CYGPATH) '$(LIBRARY_DIR1)') DLLSUFFIX = @DLLSUFFIX@ LIBSUFFIX = @LIBSUFFIX@ EXESUFFIX = @EXESUFFIX@ @@ -234,6 +230,14 @@ SHARED_BUILD = @SHARED_BUILD@ INSTALL_MSGS = @INSTALL_MSGS@ INSTALL_LIBRARIES = @INSTALL_LIBRARIES@ +# Fully qualify library path so that `make test` +# does not depend on the current directory. +# Only define these if not embedding the library +ifeq ($(ZIPFS_BUILD), 0) +LIBRARY_DIR1 = $(shell cd '$(ROOT_DIR_NATIVE)/library' ; pwd -P) +LIBRARY_DIR = $(shell $(CYGPATH) '$(LIBRARY_DIR1)') +endif + # Minizip MINIZIP_OBJS = \ adler32.$(HOST_OBJEXT) \ |