diff options
| author | Gary Benson <gbenson@redhat.com> | 2011-02-14 14:28:00 +0000 |
|---|---|---|
| committer | Gary Benson <gary@gcc.gnu.org> | 2011-02-14 14:28:00 +0000 |
| commit | fa0a5acc1e99434a33cfb8079724cca35171232c (patch) | |
| tree | e8f57e6cce4c347c389b4b279784f714f6edf8c3 /libjava/configure | |
| parent | 88d0743e1aafb0b370a4b0aefd19d09917b1e043 (diff) | |
| download | gcc-fa0a5acc1e99434a33cfb8079724cca35171232c.zip gcc-fa0a5acc1e99434a33cfb8079724cca35171232c.tar.gz gcc-fa0a5acc1e99434a33cfb8079724cca35171232c.tar.bz2 | |
PR libjava/47484: Install Python modules into versioned directory
From-SVN: r170131
Diffstat (limited to 'libjava/configure')
| -rwxr-xr-x | libjava/configure | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libjava/configure b/libjava/configure index d4a97ba..f79e53b 100755 --- a/libjava/configure +++ b/libjava/configure @@ -24631,25 +24631,22 @@ here=`${PWDCMD-pwd}` # We get this from the environment. +default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava" # Check whether --with-python-dir was given. if test "${with_python_dir+set}" = set; then : withval=$with_python_dir; with_python_dir=$withval else - with_python_dir="" + with_python_dir="${default_python_dir}" fi -if test "x${with_python_dir}" = "x" -then - # Needed for installing Python modules during make install. - python_mod_dir="\${prefix}/share/python" - # Needed for substituting into aot-compile* - python_mod_dir_expanded="${expanded_prefix}/share/python" -else - python_mod_dir="\${prefix}${with_python_dir}" - python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" -fi +# Needed for installing Python modules during make install. +python_mod_dir="\${prefix}${with_python_dir}" + +# Needed for substituting into aot-compile* +python_mod_dir_expanded="${expanded_prefix}${with_python_dir}" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: Python modules dir: ${python_mod_dir_expanded}" >&5 $as_echo "Python modules dir: ${python_mod_dir_expanded}" >&6; }; |