$NetBSD: patch-aa,v 1.3 2004/05/13 22:06:03 minskim Exp $

--- Common.mk.in.orig	2000-06-14 02:48:25.000000000 -0500
+++ Common.mk.in
@@ -36,7 +36,8 @@ TKX_FULL_VERSION   = @TKX_FULL_VERSION@
 #------------------------------------------------------------------------------
 # Programs and options used by build
 #
-CC           = @CC@
+CC           = ${LIBTOOL} --mode=compile @CC@
+LD           = ${LIBTOOL} --mode=link @CC@
 CFLAGS       = @CFLAGS@ @TCL_CFLAGS_WARNING@ @TCL_EXTRA_CFLAGS@
 SYSCFLAGS    = @SYSCFLAGS@
 RANLIB       = @RANLIB@
@@ -73,8 +74,7 @@ bldbasedir   = @bldbasedir@
 prefix       = @prefix@
 exec_prefix  = @exec_prefix@
 
-TCLX_PREFIX="${prefix}"
-TCLX_EXEC_PREFIX="${exec_prefix}"
+TCLX_EXEC_PREFIX=${TCLX_PREFIX}
 TKX_PREFIX="${prefix}"
 TKX_EXEC_PREFIX="${exec_prefix}"
 
@@ -133,8 +133,8 @@ TCL_BUILD_STUB_LIB_SPEC   = @TCL_BUILD_S
 TCL_STUB_LIB_SPEC         = @TCL_STUB_LIB_SPEC@
 TCL_LD_SEARCH_FLAGS  = @TCL_LD_SEARCH_FLAGS@
 
-TCL_GENERIC_DIR      = ${TCL_SRC_DIR}/generic
-TCL_UNIX_DIR	     = ${TCL_SRC_DIR}/unix
+TCL_GENERIC_DIR      = ${TCL_SRC_DIR}/include/tcl/generic
+TCL_UNIX_DIR	     = ${TCL_SRC_DIR}/include/tcl/unix
 
 #------------------------------------------------------------------------------
 # Configuration information from tkConfig.sh.
@@ -161,11 +161,11 @@ TK_UNIX_DIR	     = ${TK_SRC_DIR}/unix
 #------------------------------------------------------------------------------
 # Location of directories in TclX source and build trees.
 #
-TCL_GENERIC_DIR    = ${TCL_SRC_DIR}/generic
-TCL_UNIX_DIR       = ${TCL_SRC_DIR}/unix
+TCL_GENERIC_DIR    = ${TCL_EXEC_PREFIX}/include/tcl/generic
+TCL_UNIX_DIR       = ${TCL_EXEC_PREFIX}/include/tcl/unix
 TCL_LIBRARY_DIR    = ${TCL_SRC_DIR}/library
-TK_GENERIC_DIR     = ${TK_SRC_DIR}/generic
-TK_UNIX_DIR        = ${TK_SRC_DIR}/unix
+TK_GENERIC_DIR     = ${TK_EXEC_PREFIX}/include/tk/generic
+TK_UNIX_DIR        = ${TK_EXEC_PREFIX}/include/tk/unix
 
 TCLX_GENERIC_DIR   = ${srcbasedir}/tcl/generic
 TCLX_UNIX_SRC_DIR  = ${srcbasedir}/tcl/unix
@@ -190,13 +190,13 @@ COMPAT_DIR         = ${srcbasedir}/tcl/c
 #------------------------------------------------------------------------------
 # Installation directories.
 
-TCLX_INST_RUNTIME  = ${TCLX_PREFIX}/lib/tclX${TCLX_VERSION}
-TKX_INST_RUNTIME   = ${TKX_PREFIX}/lib/tkX${TKX_VERSION}
+TCLX_INST_RUNTIME  = ${TCLX_PREFIX}/lib/tcl/tclX${TCLX_VERSION}
+TKX_INST_RUNTIME   = ${TKX_PREFIX}/lib/tcl/tkX${TKX_VERSION}
 TCLX_LIBRARY_PATH  = ${TCLX_INST_RUNTIME}
 TKX_LIBRARY_PATH   = ${TKX_INST_RUNTIME}
 
-TCLX_EXEC_RUNTIME  = ${TCLX_EXEC_PREFIX}/lib/tclX${TCLX_VERSION}
-TKX_EXEC_RUNTIME   = ${TKX_EXEC_PREFIX}/lib/tkX${TKX_VERSION}
+TCLX_EXEC_RUNTIME  = ${TCLX_EXEC_PREFIX}/lib/tcl/tclX${TCLX_VERSION}
+TKX_EXEC_RUNTIME   = ${TKX_EXEC_PREFIX}/lib/tcl/tkX${TKX_VERSION}
 
 TCLX_INST_BIN      = ${TCLX_EXEC_PREFIX}/bin
 TKX_INST_BIN       = ${TKX_EXEC_PREFIX}/bin