38 lines
1.6 KiB
Text
38 lines
1.6 KiB
Text
$NetBSD: patch-ae,v 1.7 2005/07/19 11:11:58 adam Exp $
|
|
|
|
--- configure.in.orig 2005-06-29 16:40:33.000000000 +0000
|
|
+++ configure.in
|
|
@@ -520,7 +520,7 @@ else
|
|
TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
|
|
fi
|
|
TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
|
|
- TCL_LIB_SPEC="-L${libdir} ${TCL_LIB_FLAG}"
|
|
+ TCL_LIB_SPEC="${TCL_LIB_SPEC_RPATH} -L${libdir} ${TCL_LIB_FLAG}"
|
|
else
|
|
TCL_BUILD_EXP_FILE="lib.exp"
|
|
eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
|
|
@@ -551,13 +551,21 @@ VERSION=${TCL_VERSION}
|
|
#--------------------------------------------------------------------
|
|
|
|
if test "$FRAMEWORK_BUILD" = "1" ; then
|
|
- TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
|
|
+ TCL_PACKAGE_PATH_ADD="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
|
|
elif test "$prefix" != "$exec_prefix"; then
|
|
- TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
|
|
+ TCL_PACKAGE_PATH="${libdir}/tcl ${prefix}/lib"
|
|
else
|
|
- TCL_PACKAGE_PATH="${prefix}/lib"
|
|
+ TCL_PACKAGE_PATH="${prefix}/lib/tcl"
|
|
fi
|
|
|
|
+for dir in ${TCL_PACKAGE_PATH_ADD}; do
|
|
+ if test -z "${TCL_PACKAGE_PATH}"; then
|
|
+ TCL_PACKAGE_PATH="$dir"
|
|
+ else
|
|
+ TCL_PACKAGE_PATH="${TCL_PACKAGE_PATH} $dir"
|
|
+ fi
|
|
+done
|
|
+
|
|
#--------------------------------------------------------------------
|
|
# The statements below define various symbols relating to Tcl
|
|
# stub support.
|