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