tcl8.4 (8.4.19-5) tclpackagepath.diff

Summary

 unix/configure    |    4 ++--
 unix/configure.in |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

    
download this patch

Patch contents

Patch by Sergei Golovan allows to specify TCL_PACKAGE_PATH at configure stage
without adding /usr/lib to it. It helps to put the policy compliant value to
::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.

--- tcl8.4-8.4.19.orig/unix/configure
+++ tcl8.4-8.4.19/unix/configure
@@ -9281,9 +9281,9 @@
     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
-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
 else
-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
 fi
 
 #--------------------------------------------------------------------
--- tcl8.4-8.4.19.orig/unix/configure.in
+++ tcl8.4-8.4.19/unix/configure.in
@@ -670,9 +670,9 @@
     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
-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
 else
-    TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib"
 fi
 
 #--------------------------------------------------------------------