From a70d5fb05ffc7e1e7cdade79a7205b8d82bda1a9 Mon Sep 17 00:00:00 2001
From: apnadkarni <apnmbx-wits@yahoo.com>
Date: Mon, 9 Oct 2023 10:33:38 +0000
Subject: Fix test targets in mingw builds to not set TCL_LIBRARY when zipfs
 enabled

---
 win/Makefile.in | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/win/Makefile.in b/win/Makefile.in
index 367ed79..0250911 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@
@@ -232,6 +228,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) \
-- 
cgit v0.12