summaryrefslogtreecommitdiff
blob: 59d1b8af2f1e731b42687a8d1b9e6755541f7da9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
diff -Naur tcl8.4.16.orig/unix/configure.in tcl8.4.16/unix/configure.in
--- tcl8.4.16.orig/unix/configure.in	2007-09-22 02:07:02.000000000 +0900
+++ tcl8.4.16/unix/configure.in	2007-12-15 10:43:16.000000000 +0900
@@ -570,7 +570,7 @@
 DBGX='${TCL_DBGX}'
 eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
 
-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
+TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
 PRIVATE_INCLUDE_DIR='$(includedir)'
 HTML_DIR='$(DISTDIR)/html'
 
@@ -669,7 +669,7 @@
 if test "$FRAMEWORK_BUILD" = "1" ; then
     test -z "$TCL_PACKAGE_PATH" && \
         TCL_PACKAGE_PATH="~/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
+elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
 else
     TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"