Contents of /trunk/tcl/patches/tcl-8.4.13-libdir.patch
Parent Directory | Revision Log
Revision 153 -
(show annotations)
(download)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1808 byte(s)
Tue May 8 20:52:56 2007 UTC (17 years, 4 months ago) by niro
File size: 1808 byte(s)
-import
1 | diff -Naur tcl8.4.11.orig/unix/configure tcl8.4.11/unix/configure |
2 | --- tcl8.4.11.orig/unix/configure 2005-06-30 01:40:33.000000000 +0900 |
3 | +++ tcl8.4.11/unix/configure 2005-07-02 20:23:23.000000000 +0900 |
4 | @@ -7664,7 +7664,7 @@ |
5 | DBGX='${TCL_DBGX}' |
6 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
7 | |
8 | -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' |
9 | +TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
10 | PRIVATE_INCLUDE_DIR='$(includedir)' |
11 | HTML_DIR='$(DISTDIR)/html' |
12 | |
13 | @@ -7788,7 +7788,7 @@ |
14 | |
15 | if test "$FRAMEWORK_BUILD" = "1" ; then |
16 | TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks" |
17 | -elif test "$prefix" != "$exec_prefix"; then |
18 | +elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then |
19 | TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" |
20 | else |
21 | TCL_PACKAGE_PATH="${prefix}/lib" |
22 | diff -Naur tcl8.4.11.orig/unix/configure.in tcl8.4.11/unix/configure.in |
23 | --- tcl8.4.11.orig/unix/configure.in 2005-06-30 01:40:33.000000000 +0900 |
24 | +++ tcl8.4.11/unix/configure.in 2005-07-02 20:23:12.000000000 +0900 |
25 | @@ -459,7 +459,7 @@ |
26 | DBGX='${TCL_DBGX}' |
27 | eval "TCL_LIB_FILE=${TCL_LIB_FILE}" |
28 | |
29 | -TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)' |
30 | +TCL_LIBRARY='$(libdir)/tcl$(VERSION)' |
31 | PRIVATE_INCLUDE_DIR='$(includedir)' |
32 | HTML_DIR='$(DISTDIR)/html' |
33 | |
34 | @@ -552,7 +552,7 @@ |
35 | |
36 | if test "$FRAMEWORK_BUILD" = "1" ; then |
37 | TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks" |
38 | -elif test "$prefix" != "$exec_prefix"; then |
39 | +elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then |
40 | TCL_PACKAGE_PATH="${libdir} ${prefix}/lib" |
41 | else |
42 | TCL_PACKAGE_PATH="${prefix}/lib" |