From b3d34ad31717286dabbaa72b93d7ff5f3e0626a6 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 17 Feb 2021 08:35:44 +0000
Subject: Another TIP #430 fix for cygwin: libtcl8.7.dll is installed in
 /usr/bin, not in /usr/lib as on other platforms

---
 generic/tclZipfs.c | 15 ++++++---------
 unix/Makefile.in   |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c
index 0d646aa..f052c2e 100644
--- a/generic/tclZipfs.c
+++ b/generic/tclZipfs.c
@@ -3157,18 +3157,15 @@ TclZipfs_TclLibrary(void)
 	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
     }
 #else
-# if defined(CFG_RUNTIME_LIBDIR)
     if (ZipfsAppHookFindTclInit(
-	    CFG_RUNTIME_LIBDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
-	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
-    }
-# endif
-# if defined(CFG_RUNTIME_BINDIR)
-    if (ZipfsAppHookFindTclInit(
-	    CFG_RUNTIME_BINDIR "/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
+#ifdef __CYGWIN__
+		CFG_RUNTIME_BINDIR
+#else
+		CFG_RUNTIME_LIBDIR
+#endif
+		"/" CFG_RUNTIME_DLLFILE) == TCL_OK) {
 	return Tcl_NewStringObj(zipfs_literal_tcl_library, -1);
     }
-# endif
 #endif /* _WIN32 */
 #endif /* !defined(STATIC_BUILD) */
 
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 32b99a2..9c64d05 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1523,7 +1523,7 @@ tclZipfs.o: $(GENERIC_DIR)/tclZipfs.c
 	$(CC) -c $(CC_SWITCHES) \
 		-DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \
 		-DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \
-		-DCFG_RUNTIME_SCRDIR="\"$(TCL_LIBRARY)\"" \
+		-DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \
 		-I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip \
 		$(GENERIC_DIR)/tclZipfs.c
 
-- 
cgit v0.12