From 77cefba5d3e5b593929defcee2a577120d81d974 Mon Sep 17 00:00:00 2001 From: "Vladimir D. Seleznev" Date: Fri, 8 Nov 2019 01:19:10 +0300 Subject: [PATCH] ALT private headers Based on original tcl-8.5b1-alt-extra-headers.patch, which was heavily rewritten. --- tcl/unix/Makefile.in | 5 +++-- tcl/unix/tclConfig.sh.in | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tcl/unix/Makefile.in b/tcl/unix/Makefile.in index 0a99998db2..054b207501 100644 --- a/tcl/unix/Makefile.in +++ b/tcl/unix/Makefile.in @@ -63,7 +63,7 @@ INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir) PRIVATE_INCLUDE_DIR = @PRIVATE_INCLUDE_DIR@ # Directory in which to (optionally) install the private tcl headers: -PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PRIVATE_INCLUDE_DIR) +PRIVATE_INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(PRIVATE_INCLUDE_DIR)/tcl # Top-level directory in which to install manual entries: MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir) @@ -1074,7 +1074,8 @@ install-private-headers: $(GENERIC_DIR)/tclOOInt.h $(GENERIC_DIR)/tclOOIntDecls.h \ $(UNIX_DIR)/tclUnixPort.h; \ do \ - $(INSTALL_DATA) $$i "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ + $(INSTALL_DATA_DIR) "$(PRIVATE_INCLUDE_INSTALL_DIR)/$$(basename $$(dirname $$i))"; \ + $(INSTALL_DATA) $$i "$(PRIVATE_INCLUDE_INSTALL_DIR)/$$(basename $$(dirname $$i))"; \ done @if test -f tclConfig.h; then\ $(INSTALL_DATA) tclConfig.h "$(PRIVATE_INCLUDE_INSTALL_DIR)"; \ diff --git a/tcl/unix/tclConfig.sh.in b/tcl/unix/tclConfig.sh.in index f768690620..b8aa935323 100644 --- a/tcl/unix/tclConfig.sh.in +++ b/tcl/unix/tclConfig.sh.in @@ -100,7 +100,7 @@ TCL_LIB_FLAG='@TCL_LIB_FLAG@' # 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,8 @@ TCL_UNSHARED_LIB_SUFFIX='@CFG_TCL_UNSHARED_LIB_SUFFIX@' # 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' +TCL_INC_DIR='@includedir@/tcl/generic' # List of standard directories in which to look for packages during # "package require" commands. Contains the "prefix" directory plus also @@ -153,14 +154,14 @@ TCL_STUB_LIB_FLAG='@TCL_STUB_LIB_FLAG@' # 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@' -- 2.33.5