Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/tcl/patches/tcl-8.4.16-libdir.patch

    Annotation of /trunk/tcl/patches/tcl-8.4.16-libdir.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 395 - (hide annotations) (download)
    Mon Nov 5 23:59:29 2007 UTC (16 years, 6 months ago) by niro
    File size: 1984 byte(s) 
    -rediffed libdir patch against 8.4.16
    1 niro 395 diff -Naur tcl8.4.16/unix/configure tcl8.4.16-magellan/unix/configure
    2     --- tcl8.4.16/unix/configure 2007-09-21 19:07:02.000000000 +0200
    3     +++ tcl8.4.16-magellan/unix/configure 2007-11-06 00:59:03.000000000 +0100
    4     @@ -9150,7 +9150,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     @@ -9280,7 +9280,7 @@
    14     if test "$FRAMEWORK_BUILD" = "1" ; then
    15     test -z "$TCL_PACKAGE_PATH" && \
    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 ${TCL_PACKAGE_PATH}"
    20     else
    21     TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
    22     diff -Naur tcl8.4.16/unix/configure.in tcl8.4.16-magellan/unix/configure.in
    23     --- tcl8.4.16/unix/configure.in 2007-09-21 19:07:02.000000000 +0200
    24     +++ tcl8.4.16-magellan/unix/configure.in 2007-11-06 00:59:45.000000000 +0100
    25     @@ -570,7 +570,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     @@ -669,7 +669,7 @@
    35     if test "$FRAMEWORK_BUILD" = "1" ; then
    36     test -z "$TCL_PACKAGE_PATH" && \
    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 ${TCL_PACKAGE_PATH}"
    41     else
    42     TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"