From: Peter O'Gorman <peter@pogma.com>
Date: Sat, 23 May 2009 20:13:14 +0000 (+0200)
Subject: python: do not install in system directories on Darwin 9.
X-Git-Tag: v1.12.0b~654
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d44a667bd1307162187efe7514e6d4abd122dd6;p=platform%2Fupstream%2Fautomake.git

python: do not install in system directories on Darwin 9.

On Darwin 9, get_python_lib returns a path below `/Library/Python'
regardless of the `prefix' argument it was passed, causing `make
install' to target the system directories regardless of `--prefix'
argument used.  Work around this Darwin bug by ignoring the result
of get_python_lib if it points outside of the passed prefix, and
the prefix was not a system directory.

* m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
initial portion of the pythondir returned by get_python_lib, then
ignore it unless the configured prefix is `/usr' or starts with
`/System'.  Fixes instmany-python.test failure on Mac OS X 10.5.7.
* NEWS: Update.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 7492eaf..78b43e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2009-05-23  Peter O'Gorman  <peter@pogma.com>
+
+	python: do not install in system directories on Darwin 9.
+	On Darwin 9, get_python_lib returns a path below `/Library/Python'
+	regardless of the `prefix' argument it was passed, causing `make
+	install' to target the system directories regardless of `--prefix'
+	argument used.  Work around this Darwin bug by ignoring the result
+	of get_python_lib if it points outside of the passed prefix, and
+	the prefix was not a system directory.
+	* m4/python.m4 (AM_PATH_PYTHON): If the prefix does not match the
+	initial portion of the pythondir returned by get_python_lib, then
+	ignore it unless the configured prefix is `/usr' or starts with
+	`/System'.  Fixes instmany-python.test failure on Mac OS X 10.5.7.
+	* NEWS: Update.
+
 2009-05-23  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Clarify how to enable `silent-rules' and other global options.
diff --git a/NEWS b/NEWS
index fe4a4d9..20d5080 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+New in 1.11.0a:
+
+Bugs fixed in 1.11.0a:
+
+* Long standing bugs:
+
+  - On Darwin 9, `pythondir' and `pyexecdir' pointed below `/Library/Python'
+    even if the `--prefix' argument pointed outside of a system directory.
+    AM_PATH_PYTHON has been fixed to ignore the value returned from python's
+    `get_python_lib' function if it points outside the configured prefix,
+    unless the `--prefix' argument was either `/usr' or below `/System'.
+
+
 New in 1.11:
 
 * Version requirements:
diff --git a/m4/python.m4 b/m4/python.m4
index 239285f..16de9c3 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -128,6 +128,14 @@ python2.1 python2.0])
        am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
        am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
        ;;
+     *)
+       case $am_py_prefix in
+         /usr|/System*) ;;
+         *)
+	  am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	  ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pythondir], [$am_cv_python_pythondir])
@@ -158,6 +166,14 @@ python2.1 python2.0])
        am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
        am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
        ;;
+     *)
+       case $am_py_exec_prefix in
+         /usr|/System*) ;;
+         *)
+	   am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
+	   ;;
+       esac
+       ;;
      esac
     ])
   AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])