1Lets install the include header and private header files into
2usr/include/tcl8.6 when version of tcl is 8.6.x
3
4Upstream-Status: Inappropriate [Configuration Specific]
5
6Signed-off-by: Khem Raj <raj.khem@gmai.com>
7
8Fixed the TCL_INCLUDE_SPEC
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12
13---
14 Makefile.in  | 2 +-
15 configure    | 4 ++--
16 configure.in | 4 ++--
17 3 files changed, 5 insertions(+), 5 deletions(-)
18
19diff --git a/Makefile.in b/Makefile.in
20index 0370491..daa569a 100644
21--- a/Makefile.in
22+++ b/Makefile.in
23@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR	= $(INSTALL_ROOT)$(TCL_LIBRARY)
24 MODULE_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)/../tcl8
25
26 # Directory in which to install the include file tcl.h:
27-INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)
28+INCLUDE_INSTALL_DIR	= $(INSTALL_ROOT)$(includedir)/tcl$(VERSION)
29
30 # Path to the private tcl header dir:
31 PRIVATE_INCLUDE_DIR	= @PRIVATE_INCLUDE_DIR@
32diff --git a/configure b/configure
33index 181b9b3..f4cc225 100755
34--- a/configure
35+++ b/configure
36@@ -10166,7 +10166,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
37 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
38
39 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
40-PRIVATE_INCLUDE_DIR='$(includedir)'
41+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
42 HTML_DIR='$(DISTDIR)/html'
43
44 # Note:  in the following variable, it's important to use the absolute
45@@ -10323,7 +10323,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
46 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
47
48 # Install time header dir can be set via --includedir
49-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
50+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
51
52 #------------------------------------------------------------------------
53 # tclConfig.sh refers to this by a different name
54diff --git a/configure.in b/configure.in
55index 9f96e2b..e323e02 100644
56--- a/configure.in
57+++ b/configure.in
58@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}"
59 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
60
61 test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
62-PRIVATE_INCLUDE_DIR='$(includedir)'
63+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)'
64 HTML_DIR='$(DISTDIR)/html'
65
66 # Note:  in the following variable, it's important to use the absolute
67@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}"
68 TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}"
69
70 # Install time header dir can be set via --includedir
71-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\""
72+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\""
73
74 #------------------------------------------------------------------------
75 # tclConfig.sh refers to this by a different name
76--
772.25.1
78
79