From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sun, 16 Feb 2014 16:24:38 +0000 (-0500)
Subject: On Windows, expect to find Tcl DLL in bin directory not lib directory.
X-Git-Tag: REL9_4_BETA1~469
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56caaf195e996919088d532832a2a57ca33431b2;p=postgresql

On Windows, expect to find Tcl DLL in bin directory not lib directory.

Still another step in the continuing saga of trying to get
--disable-auto-import to work.

Hiroshi Inoue
---

diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index e0fb13e56e..2ab2a2791b 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -53,7 +53,7 @@ PSQLDIR = $(bindir)
 ifeq ($(PORTNAME), win32)
 
 tclwithver = $(subst -l,,$(filter -l%, $(TCL_LIB_SPEC)))
-TCLDLL = $(subst -L,,$(filter -L%, $(TCL_LIB_SPEC)))/$(tclwithver).dll
+TCLDLL = $(dir $(TCLSH))/$(tclwithver).dll
 
 OBJS += lib$(tclwithver).a