--- branches/magellan-next/include/python.sminc	2011/07/12 17:20:55	8123
+++ branches/magellan-next/include/python.sminc	2011/07/27 11:10:28	8643
@@ -1,4 +1,7 @@
-# $Header: /magellan-cvs/smage/include/python.sminc,v 1.4 2007/01/23 20:46:41 niro Exp $
+# $Id$
+
+# needed for mbindir()
+sminclude mtools
 
 # get the major.minor current installed python version
 # -> ex 2.4
@@ -14,7 +17,7 @@
 get_python_libdir()
 {
 	local pylib
-	pylib=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_version()')
+	pylib=$(python -c 'from distutils import sysconfig; print sysconfig.get_python_lib()')
 	echo "${pylib}"
 	return 0
 }
@@ -50,12 +53,12 @@
 
 	if [[ -e setup.py ]]
 	then
-		python setup.py install --no-compile --root ${BINDIR} "$@" || die
+		python setup.py install --no-compile --root $(mbindir) "$@" || die
 	elif [[ -e waf ]]
 	then
-		python waf install --destdir="${BINDIR}" "$@" || die
+		python waf install --destdir="$(mbindir)" "$@" || die
 	else
-		mmake DESTDIR=${BINDIR} install || die
+		mmake DESTDIR=$(mbindir) install || die
 	fi
 
 	local i