1*4882a593SmuzhiyunLets install the include header and private header files into 2*4882a593Smuzhiyunusr/include/tcl8.6 when version of tcl is 8.6.x 3*4882a593Smuzhiyun 4*4882a593SmuzhiyunUpstream-Status: Inappropriate [Configuration Specific] 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmai.com> 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunFixed the TCL_INCLUDE_SPEC 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Robert Yang <liezhi.yang@windriver.com> 11*4882a593SmuzhiyunSigned-off-by: Yi Zhao <yi.zhao@windriver.com> 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun Makefile.in | 2 +- 15*4882a593Smuzhiyun configure | 4 ++-- 16*4882a593Smuzhiyun configure.in | 4 ++-- 17*4882a593Smuzhiyun 3 files changed, 5 insertions(+), 5 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/Makefile.in b/Makefile.in 20*4882a593Smuzhiyunindex 0370491..daa569a 100644 21*4882a593Smuzhiyun--- a/unix/Makefile.in 22*4882a593Smuzhiyun+++ b/unix/Makefile.in 23*4882a593Smuzhiyun@@ -57,7 +57,7 @@ SCRIPT_INSTALL_DIR = $(INSTALL_ROOT)$(TCL_LIBRARY) 24*4882a593Smuzhiyun MODULE_INSTALL_DIR = $(SCRIPT_INSTALL_DIR)/../tcl8 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun # Directory in which to install the include file tcl.h: 27*4882a593Smuzhiyun-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) 28*4882a593Smuzhiyun+INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)/tcl$(VERSION) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun # Path to the private tcl header dir: 31*4882a593Smuzhiyun PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ 32*4882a593Smuzhiyundiff --git a/configure.in b/configure.in 33*4882a593Smuzhiyunindex 9f96e2b..e323e02 100644 34*4882a593Smuzhiyun--- a/unix/configure.in 35*4882a593Smuzhiyun+++ b/unix/configure.in 36*4882a593Smuzhiyun@@ -773,7 +773,7 @@ eval "TCL_LIB_FILE=libtcl${LIB_SUFFIX}" 37*4882a593Smuzhiyun eval "TCL_LIB_FILE=${TCL_LIB_FILE}" 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun test -z "$TCL_LIBRARY" && TCL_LIBRARY='$(libdir)/tcl$(VERSION)' 40*4882a593Smuzhiyun-PRIVATE_INCLUDE_DIR='$(includedir)' 41*4882a593Smuzhiyun+PRIVATE_INCLUDE_DIR='$(includedir)/tcl$(VERSION)' 42*4882a593Smuzhiyun HTML_DIR='$(DISTDIR)/html' 43*4882a593Smuzhiyun 44*4882a593Smuzhiyun # Note: in the following variable, it's important to use the absolute 45*4882a593Smuzhiyun@@ -894,7 +894,7 @@ TCL_BUILD_STUB_LIB_PATH="`pwd`/${TCL_STUB_LIB_FILE}" 46*4882a593Smuzhiyun TCL_STUB_LIB_PATH="${TCL_STUB_LIB_DIR}/${TCL_STUB_LIB_FILE}" 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun # Install time header dir can be set via --includedir 49*4882a593Smuzhiyun-eval "TCL_INCLUDE_SPEC=\"-I${includedir}\"" 50*4882a593Smuzhiyun+eval "TCL_INCLUDE_SPEC=\"-I${includedir}/tcl${VERSION}\"" 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun #------------------------------------------------------------------------ 53*4882a593Smuzhiyun # tclConfig.sh refers to this by a different name 54*4882a593Smuzhiyun-- 55*4882a593Smuzhiyun2.25.1 56*4882a593Smuzhiyun 57