From 46756a69877ab7d56f3b05f8c5a8899eb24d9ffd Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Mon, 9 Nov 2020 15:57:32 -0500 Subject: depends: Fix PYTHONPATH setting in config.site.in Previously, when running ./configure: 1. With CONFIG_SITE pointed to our depends config.site.in, and 2. PYTHONPATH was not set either in the environment or by the user The configure would output something like: PYTHONPATH='depends/x86_64-pc-linux-gnu/share/../native/lib/python3/dist-packages:' When we really mean: PYTHONPATH='depends/x86_64-pc-linux-gnu/share/../native/lib/python3/dist-packages' ...without the colon This change makes sure that: 1. There's no trailing colon, and 2. We use the $PATH_SEPARATOR variable instead of a colon --- depends/config.site.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'depends/config.site.in') diff --git a/depends/config.site.in b/depends/config.site.in index c39975ecde..f4531830c8 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -79,7 +79,7 @@ fi if test -n "@CXX@" -a -z "${CXX}"; then CXX="@CXX@" fi -PYTHONPATH=$depends_prefix/native/lib/python3/dist-packages:$PYTHONPATH +PYTHONPATH="${depends_prefix}/native/lib/python3/dist-packages${PYTHONPATH:+${PATH_SEPARATOR}}${PYTHONPATH}" if test -n "@AR@"; then AR=@AR@ -- cgit v1.2.3