--- tk8.4.10/unix/Makefile.in..xhdrs	2005-06-03 23:59:49 +0400

+++ tk8.4.10/unix/Makefile.in	2005-06-13 17:13:10 +0400

@@ -651,6 +651,7 @@

 	@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} \

+		$(INCLUDE_INSTALL_DIR)/tk/generic $(INCLUDE_INSTALL_DIR)/tk/unix \

 		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images \

 		$(SCRIPT_INSTALL_DIR)/msgs; \

 	    do \

@@ -670,6 +671,14 @@

 	    do \

 	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR); \

 	    done;

+	@for i in 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;

 	@list='$(@TK_WINDOWINGSYSTEM@_XLIB_HDRS)'; for i in $$list ; \

 	    do \

 	    $(INSTALL_DATA) $$i $(INCLUDE_INSTALL_DIR)/X11; \

--- tk8.4.10/unix/tkConfig.sh.in..xhdrs	2005-06-03 23:59:49 +0400

+++ tk8.4.10/unix/tkConfig.sh.in	2005-06-13 17:15:06 +0400

@@ -53,7 +53,7 @@

 # 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.

@@ -65,7 +65,8 @@

 # 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.

@@ -80,14 +81,14 @@

 # 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@'