$NetBSD: patch-aa,v 1.10 2004/03/25 22:49:15 jlam Exp $

--- Makefile.in.orig	Mon Mar  1 19:04:48 2004
+++ Makefile.in
@@ -80,7 +80,7 @@ MANN_INSTALL_DIR	= $(MAN_INSTALL_DIR)/ma
 # The directory containing the Tcl sources and headers appropriate
 # for this version of Tk ("srcdir" will be replaced or has already
 # been replaced by the configure script):
-TCL_GENERIC_DIR		= @TCL_SRC_DIR@/generic
+TCL_GENERIC_DIR		= $(TCL_BIN_DIR)/../include/tcl/generic
 
 # The directory containing the Tcl library archive file appropriate
 # for this version of Tk:
@@ -118,7 +118,7 @@ CFLAGS			= @CFLAGS@ @CFLAGS_DEFAULT@
 # Flags to pass to the linker
 LDFLAGS_DEBUG		= @LDFLAGS_DEBUG@
 LDFLAGS_OPTIMIZE	= @LDFLAGS_OPTIMIZE@
-LDFLAGS			= @LDFLAGS@ @LDFLAGS_DEFAULT@
+LDFLAGS			= @LD_FLAGS@ @LDFLAGS@ @LDFLAGS_DEFAULT@
 
 # A "-I" switch that can be used when compiling to make all of the
 # X11 include files accessible (the configure script will try to
@@ -176,8 +176,8 @@ SHELL			= /bin/sh
 INSTALL_STRIP_PROGRAM   = -s
 INSTALL_STRIP_LIBRARY   = -S -S
 
-INSTALL			= @srcdir@/install-sh -c
-INSTALL_PROGRAM		= ${INSTALL}
+INSTALL			= ${LIBTOOL} --mode=install @srcdir@/install-sh -c
+INSTALL_PROGRAM		= ${INSTALL} -s
 INSTALL_LIBRARY		= ${INSTALL}
 INSTALL_DATA		= ${INSTALL} -m 644
 
@@ -234,7 +234,7 @@ WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11
 # The values of the symbolis normally set by the configure script.
 
 STLIB_LD		= @STLIB_LD@
-SHLIB_LD		= @SHLIB_LD@
+SHLIB_LD		= ${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib
 SHLIB_LD_FLAGS		= @SHLIB_LD_FLAGS@
 SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
 TK_SHLIB_LD_EXTRAS	= @TK_SHLIB_LD_EXTRAS@
@@ -274,7 +274,8 @@ TOOL_DIR		= @TCL_SRC_DIR@/tools
 # should be compressed and linked with softlinks
 MKLINKS_FLAGS           = @MKLINKS_FLAGS@
 
-CC			= @CC@
+CC			= ${LIBTOOL} --mode=compile @CC@
+LD			= ${LIBTOOL} --mode=link @CC@ -Wl,-R${PREFIX}/lib -Wl,-R${X11BASE}/lib
 
 CC_SWITCHES_NO_STUBS = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I${UNIX_DIR} -I${GENERIC_DIR} \
@@ -422,7 +423,7 @@ objs: ${OBJS}
 
 
 wish: $(WISH_OBJS) $(TK_LIB_FILE) $(TK_STUB_LIB_FILE)
-	$(CC) $(LDFLAGS) $(WISH_OBJS) \
+	$(LD) $(LDFLAGS) $(WISH_OBJS) \
 		@TK_BUILD_LIB_SPEC@ \
 		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o wish
 
@@ -436,7 +437,7 @@ tktest: $(TKTEST_OBJS) $(TK_LIB_FILE)
 	$(MAKE) tktest-real LIB_RUNTIME_DIR=`pwd`:$(TCL_BIN_DIR)
 
 tktest-real:
-	${CC} $(LDFLAGS) $(TKTEST_OBJS) \
+	${LD} $(LDFLAGS) $(TKTEST_OBJS) \
 		@TK_BUILD_LIB_SPEC@ \
 		$(WISH_LIBS) $(CC_SEARCH_FLAGS) -o tktest
 
@@ -445,7 +446,7 @@ tktest-real:
 # lib location logic from tktest, and it is not clear where this
 # test.o object file comes from.
 xttest: test.o tkTest.o tkSquare.o $(TK_LIB_FILE)
-	${CC} $(LDFLAGS) test.o tkTest.o tkSquare.o \
+	${LD} $(LDFLAGS) test.o tkTest.o tkSquare.o \
 		@TK_BUILD_LIB_SPEC@ \
 		$(WISH_LIBS) $(LD_SEARCH_FLAGS) -lXt -o xttest