From 6234620760cd77a9c03905be85b81b7d98cb1065 Mon Sep 17 00:00:00 2001
From: Sergey Bolshakov <sbolshakov@altlinux.org>
Date: Sat, 15 Sep 2007 02:27:41 +0400
Subject: [PATCH] ALT extra headers

---
 tk/unix/Makefile.in    | 11 ++++++++++-
 tk/unix/tkConfig.sh.in |  9 +++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/tk/unix/Makefile.in b/tk/unix/Makefile.in
index 010ba48d5..e538ee096 100644
--- a/tk/unix/Makefile.in
+++ b/tk/unix/Makefile.in
@@ -861,7 +861,8 @@ install-doc:
 install-headers:
 	@if test "$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)" != ""; then \
 	    XLIB_INCLUDE_INSTALL_DIR="$(INCLUDE_INSTALL_DIR)"/X11; fi; \
-	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}"; \
+	for i in "$(INCLUDE_INSTALL_DIR)" "$${XLIB_INCLUDE_INSTALL_DIR}" \
+		"$(INCLUDE_INSTALL_DIR)/tk/generic" "$(INCLUDE_INSTALL_DIR)/tk/unix"; \
 	    do \
 	    if [ -n "$$i" -a ! -d "$$i" ] ; then \
 		echo "Making directory $$i"; \
@@ -878,6 +879,14 @@ install-headers:
 	    do \
 	    $(INSTALL_DATA) $$i "$(INCLUDE_INSTALL_DIR)/X11"; \
 	    done;
+	@for i in tkFont.h tkInt.h tkIntDecls.h tkIntXlibDecls.h tkCanvas.h tkPort.h default.h; \
+		do \
+		$(INSTALL_DATA) $(GENERIC_DIR)/$$i $(INCLUDE_INSTALL_DIR)/tk/generic; \
+		done;
+	@for i in tkUnixPort.h tkUnixDefault.h tkUnixInt.h ; \
+		do \
+		$(INSTALL_DATA) $(UNIX_DIR)/$$i $(INCLUDE_INSTALL_DIR)/tk/unix; \
+		done;
 
 # Optional target to install private headers
 install-private-headers:
diff --git a/tk/unix/tkConfig.sh.in b/tk/unix/tkConfig.sh.in
index bb85ad0a2..9d74583dc 100644
--- a/tk/unix/tkConfig.sh.in
+++ b/tk/unix/tkConfig.sh.in
@@ -53,7 +53,7 @@ TK_LIB_FLAG='@TK_LIB_FLAG@'
 
 # String to pass to linker to pick up the Tk library from its
 # build directory.
-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@'
+TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@'
 
 # String to pass to linker to pick up the Tk library from its
 # installed directory.
@@ -69,7 +69,8 @@ TK_INCLUDE_SPEC='@TK_INCLUDE_SPEC@'
 # different place than the directory containing the source files, this
 # points to the location of the sources, not the location where Tk was
 # compiled.
-TK_SRC_DIR='@TK_SRC_DIR@'
+TK_SRC_DIR='@includedir@/tk'
+TK_INC_DIR='@includedir@/tk/generic'
 
 # Needed if you want to make a 'fat' shared library library
 # containing tk objects or link a different wish.
@@ -84,14 +85,14 @@ TK_STUB_LIB_FLAG='@TK_STUB_LIB_FLAG@'
 
 # String to pass to linker to pick up the Tk stub library from its
 # build directory.
-TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@'
+TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the Tk stub library from its
 # installed directory.
 TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
 
 # Path to the Tk stub library in the build directory.
-TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@'
+TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
 
 # Path to the Tk stub library in the install directory.
 TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
-- 
2.33.0