OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR libjava/47484: Install Python modules into versioned directory 

From-SVN: r170131
This commit is contained in:
Gary Benson 2011-02-14 14:28:00 +00:00 committed by Gary Benson
parent 88d0743e1a
commit fa0a5acc1e
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2011-02-14 Gary Benson <gbenson@redhat.com>
PR libjava/47484
* configure.ac (python_mod_dir, python_mod_dir_expanded):
Install Python modules into versioned directory.
* configure: Regenerate.
2011-02-13 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
* configure: Regenerate.

19
libjava/configure vendored
View File

@ -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; };

19
libjava/configure.ac
View File

@ -1843,21 +1843,18 @@ AC_SUBST(here)
# We get this from the environment.
AC_SUBST(GCJFLAGS)
default_python_dir="/share/gcc-`cat ${srcdir}/../gcc/BASE-VER`/python/libjava"
AC_ARG_WITH([python-dir],
AS_HELP_STRING([--with-python-dir],
[the location to install Python modules. This path should NOT include the prefix.]),
[with_python_dir=$withval], [with_python_dir=""])
[with_python_dir=$withval], [with_python_dir="${default_python_dir}"])
# 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}"
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
AC_MSG_RESULT(Python modules dir: ${python_mod_dir_expanded});
AC_SUBST(python_mod_dir)
AC_SUBST(python_mod_dir_expanded)