[Rivet-svn] r2564 - in trunk: . bin

[blackhole at projects.hepforge.org]

Author: buckley
Date: Tue Jul  6 16:19:50 2010
New Revision: 2564

Log:
Fixed/improved PYTHONPATH construction

Modified:
   trunk/bin/rivet-config.in
   trunk/configure.ac
   trunk/rivetenv.sh.in

Modified: trunk/bin/rivet-config.in
==============================================================================
--- trunk/bin/rivet-config.in	Tue Jul  6 15:17:11 2010	(r2563)
+++ trunk/bin/rivet-config.in	Tue Jul  6 16:19:50 2010	(r2564)
@@ -1,7 +1,9 @@
 #! /usr/bin/env bash
-# @configure_input@
+## @configure_input@
 
-# These variables need to exist
+## These variables need to exist
+## Note no use of $DESTDIR... we ignore it so that destdir can be used
+## for temp installs later copied to /
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
@@ -47,13 +49,7 @@
 test -n "$tmp" && OUT="$OUT @datadir@/@PACKAGE_TARNAME@"
 
 tmp=$( echo "$*" | egrep -- '--\<pythonpath\>')
-test -n "$tmp" && {
-    ppath="@PYTHON_PREFIX@/lib/python at PYTHON_VERSION@/site-packages"
-    if test -e "@PYTHON_PREFIX@/lib64/python at PYTHON_VERSION@/site-packages"; then
-        ppath="$ppath:@PYTHON_PREFIX@/lib64/python at PYTHON_VERSION@/site-packages"
-    fi
-    OUT="$OUT $ppath"
-}
+test -n "$tmp" && OUT="$OUT @RIVET_PYTHONPATH@"
 
 ## "Pre-rolled" build info
 tmp=$( echo "$*" | egrep -- '--\<cppflags\>')

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	Tue Jul  6 15:17:11 2010	(r2563)
+++ trunk/configure.ac	Tue Jul  6 16:19:50 2010	(r2564)
@@ -192,6 +192,10 @@
 if test x$enable_pyext == xyes; then
   AZ_PYTHON_PATH
   AZ_PYTHON_VERSION_ENSURE([2.3])
+  PYTHON_VERSION=`$PYTHON -c "import sys; print ".".join(map(str, sys.version_info[:2]));"`
+  AC_SUBST(PYTHON_VERSION)
+  RIVET_PYTHONPATH=`$PYTHON -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(prefix='$prefix');"`
+  AC_SUBST(RIVET_PYTHONPATH)
   ## Test for Python header
   if test -x "$PYTHON"; then
     AC_MSG_CHECKING([for Python include path])

Modified: trunk/rivetenv.sh.in
==============================================================================
--- trunk/rivetenv.sh.in	Tue Jul  6 15:17:11 2010	(r2563)
+++ trunk/rivetenv.sh.in	Tue Jul  6 16:19:50 2010	(r2564)
@@ -4,8 +4,4 @@
 
 export PATH="$exec_prefix/bin:$PATH"
 export LD_LIBRARY_PATH="@libdir@:@HEPMCLIBPATH@:@FASTJETLIBPATH@:@GSLLIBPATH@:$LD_LIBRARY_PATH"
-ppath="@PYTHON_PREFIX@/lib/python at PYTHON_VERSION@/site-packages"
-if test -e "@PYTHON_PREFIX@/lib64/python at PYTHON_VERSION@/site-packages"; then
-    ppath="$ppath:@PYTHON_PREFIX@/lib64/python at PYTHON_VERSION@/site-packages"
-fi
-export PYTHONPATH="$ppath:$PYTHONPATH"
+export PYTHONPATH="@RIVET_PYTHONPATH@:$PYTHONPATH"