diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-17 08:35:44 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-17 08:35:44 (GMT) |
| commit | b3d34ad31717286dabbaa72b93d7ff5f3e0626a6 (patch) | |
| tree | 6d8ed30538874c1be42942cc53c61e797fcf6670 /generic/tclZipfs.c | |
| parent | 499e962572ad76700414e1c910b330ac52578cf8 (diff) | |
| download | tcl-b3d34ad31717286dabbaa72b93d7ff5f3e0626a6.zip tcl-b3d34ad31717286dabbaa72b93d7ff5f3e0626a6.tar.gz tcl-b3d34ad31717286dabbaa72b93d7ff5f3e0626a6.tar.bz2 | |
Another TIP #430 fix for cygwin: libtcl8.7.dll is installed in /usr/bin, not in /usr/lib as on other platforms
Diffstat (limited to 'generic/tclZipfs.c')
| -rw-r--r-- | generic/tclZipfs.c | 15 |
1 files changed, 6 insertions, 9 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) */ |