summaryrefslogtreecommitdiffstats
path: root/patches/01_tcl-private.patch
blob: 13488c2b9fac1d3f76707984efb1bf9676476b98 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From: Chris Waters <xtifr@debian.org>
Origin: <http://anonscm.debian.org/viewvc/pkg-tcltk/tcl8.6/branches/experimental/debian/patches/tclprivate.diff?revision=1447&view=markup&pathrev=1447>
Subject: Set TCL_SRC_DIR and other paths to a directory under /usr/include

Some packages (e.g. expect) look for Tcl private headers either next to the
public headers or in the Tcl source code (cf. the definition of the
"TEA_PRIVATE_TCL_HEADERS" M4 macro).  We install Tcl's private headers under
/usr/include, so with this patch we can point TCL_SRC_DIR to the headers.

diff -Naur src.orig/unix/tclConfig.sh.in src/unix/tclConfig.sh.in
--- src.orig/unix/tclConfig.sh.in	2013-09-19 16:17:13.000000000 -0400
+++ src/unix/tclConfig.sh.in	2014-01-05 12:13:40.001771263 -0500
@@ -100,7 +100,7 @@
 
 # String to pass to linker to pick up the Tcl library from its
 # build directory.
-TCL_BUILD_LIB_SPEC='@TCL_BUILD_LIB_SPEC@'
+TCL_BUILD_LIB_SPEC='@TCL_LIB_SPEC@'
 
 # String to pass to linker to pick up the Tcl library from its
 # installed directory.
@@ -135,7 +135,7 @@
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tcl was
 # compiled.
-TCL_SRC_DIR='@TCL_SRC_DIR@'
+TCL_SRC_DIR='@includedir@/tcl-private'
 
 # List of standard directories in which to look for packages during
 # "package require" commands.  Contains the "prefix" directory plus also
@@ -153,14 +153,14 @@
 
 # String to pass to linker to pick up the Tcl stub library from its
 # build directory.
-TCL_BUILD_STUB_LIB_SPEC='@TCL_BUILD_STUB_LIB_SPEC@'
+TCL_BUILD_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the Tcl stub library from its
 # installed directory.
 TCL_STUB_LIB_SPEC='@TCL_STUB_LIB_SPEC@'
 
 # Path to the Tcl stub library in the build directory.
-TCL_BUILD_STUB_LIB_PATH='@TCL_BUILD_STUB_LIB_PATH@'
+TCL_BUILD_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'
 
 # Path to the Tcl stub library in the install directory.
 TCL_STUB_LIB_PATH='@TCL_STUB_LIB_PATH@'