From 9e182b4c49269c583fb7b2a5cbaf757e7633062b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 10 Apr 2020 14:43:32 +0000
Subject: Fix determination of TCL_PACKAGE_PATH if it contains multiple
 directories, and at least one of them contains a space.

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

diff --git a/unix/configure b/unix/configure
index e896fea..f28cc8c 100755
--- a/unix/configure
+++ b/unix/configure
@@ -18840,9 +18840,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     test -z "$TCL_MODULE_PATH"  && \
 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
 elif test "$prefix/lib" != "$libdir"; then
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
 else
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
 fi
 
 #--------------------------------------------------------------------
diff --git a/unix/configure.in b/unix/configure.in
index 8ab9672..0c66258 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -866,9 +866,9 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
     test -z "$TCL_MODULE_PATH"  && \
 	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl"
 elif test "$prefix/lib" != "$libdir"; then
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib} ${TCL_PACKAGE_PATH}"
 else
-    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"
+    test -z "$TCL_PACKAGE_PATH" && TCL_PACKAGE_PATH="{${prefix}/lib} ${TCL_PACKAGE_PATH}"
 fi
 
 #--------------------------------------------------------------------
diff --git a/win/configure b/win/configure
index 4979961..cc5a3fc 100755
--- a/win/configure
+++ b/win/configure
@@ -5123,9 +5123,9 @@ fi
 #--------------------------------------------------------------------
 
 if test "$prefix/lib" != "$libdir"; then
-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+    TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}"
 else
-    TCL_PACKAGE_PATH="${prefix}/lib"
+    TCL_PACKAGE_PATH="{${prefix}/lib}"
 fi
 
 # The tclsh.exe.manifest requires these
diff --git a/win/configure.in b/win/configure.in
index cae6568..d1b2b20 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -359,9 +359,9 @@ fi
 #--------------------------------------------------------------------
 
 if test "$prefix/lib" != "$libdir"; then
-    TCL_PACKAGE_PATH="${libdir} ${prefix}/lib"
+    TCL_PACKAGE_PATH="{${libdir}} {${prefix}/lib}"
 else
-    TCL_PACKAGE_PATH="${prefix}/lib"
+    TCL_PACKAGE_PATH="{${prefix}/lib}"
 fi
 
 # The tclsh.exe.manifest requires these
-- 
cgit v0.12