summaryrefslogtreecommitdiffstats
path: root/unix/Makefile.in
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-24 10:14:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2021-02-24 10:14:01 (GMT)
commitbd8b8ff3b710e8ae5f4750eadc84c9d96c3ea4c7 (patch)
tree54f85fdbd242e594fd5a28c083eb6c458e1f9ee4 /unix/Makefile.in
parent36711a3721be3776af05af4cd109ffe58cb168f8 (diff)
downloadtcl-bd8b8ff3b710e8ae5f4750eadc84c9d96c3ea4c7.zip
tcl-bd8b8ff3b710e8ae5f4750eadc84c9d96c3ea4c7.tar.gz
tcl-bd8b8ff3b710e8ae5f4750eadc84c9d96c3ea4c7.tar.bz2
Final implementation tweaks, fix comments, allow Tcl to load from <prefix>/lib (or <prefix>/bin on win32/cygwin) even when this is not in your PATH.
Diffstat (limited to 'unix/Makefile.in')
-rw-r--r--unix/Makefile.in7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 4e7b06c..936f2f2 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -201,7 +201,6 @@ BUILD_DLTEST = @BUILD_DLTEST@
TCL_LIB_FILE = @TCL_LIB_FILE@
#TCL_LIB_FILE = libtcl.a
-TCL_PREV_LIB_FILE = @TCL_PREV_LIB_FILE@
# Generic lib name used in rules that apply to tcl and tk
LIB_FILE = ${TCL_LIB_FILE}
@@ -1914,7 +1913,11 @@ tclStubLib.o: $(GENERIC_DIR)/tclStubLib.c
$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD @CFLAGS_NOLTO@ $(GENERIC_DIR)/tclStubLib.c
tclStubCall.o: $(GENERIC_DIR)/tclStubCall.c
- $(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD -DTCL_DLL_FILE="\"$(TCL_LIB_FILE)\"" $(GENERIC_DIR)/tclStubCall.c
+ $(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD \
+ -DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \
+ -DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \
+ -DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \
+ $(GENERIC_DIR)/tclStubCall.c
tclStubLibTbl.o: $(GENERIC_DIR)/tclStubLibTbl.c
$(CC) -c $(STUB_CC_SWITCHES) -DSTATIC_BUILD $(GENERIC_DIR)/tclStubLibTbl.c