diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | python/Makefile.am | 7 | ||||
| -rw-r--r-- | python/mpw/test/Makefile.am | 3 | ||||
| -rw-r--r-- | python/rpmdb/test/Makefile.am | 4 |
4 files changed, 3 insertions, 12 deletions
@@ -37,6 +37,7 @@ - popt: pad to display length, not strlen, for i18n popt args (#106240). - python: include Python.h before glibc features.h. - python: return [], not None, accessing header tags (#112794). + - python: avoid invoking python to acquire ill-specified parameters. 4.2 -> 4.2.1: - fix: nested %if handling, optind initialization posix vs. glibc. diff --git a/python/Makefile.am b/python/Makefile.am index 300a6a07c..75ef6d0eb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -4,11 +4,8 @@ AUTOMAKE_OPTIONS = 1.4 foreign LINT = splint -PYVER= @WITH_PYTHON_VERSION@ - -# XXX grrr, sys.path[1] wrong value in python-2.3.2 -pylibdir = $(shell python -c 'import sys; print sys.path[2]') -pyincdir = $(prefix)/include/python${PYVER} +pylibdir = ${prefix}/lib@MARK64@/python@WITH_PYTHON_VERSION@ +pyincdir = $(prefix)/include/python@WITH_PYTHON_VERSION@ SUBDIRS = rpmdb diff --git a/python/mpw/test/Makefile.am b/python/mpw/test/Makefile.am index a6cbc75e8..75943417f 100644 --- a/python/mpw/test/Makefile.am +++ b/python/mpw/test/Makefile.am @@ -2,9 +2,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign -PYVER= @WITH_PYTHON_VERSION@ - -pylibdir = $(shell python -c 'import sys; print sys.path[1]') VALGRIND = # valgrind --verbose --leak-check=yes EXTRA_DIST = \ diff --git a/python/rpmdb/test/Makefile.am b/python/rpmdb/test/Makefile.am index 667ad87c8..705cec611 100644 --- a/python/rpmdb/test/Makefile.am +++ b/python/rpmdb/test/Makefile.am @@ -2,10 +2,6 @@ AUTOMAKE_OPTIONS = 1.4 foreign -PYVER= @WITH_PYTHON_VERSION@ - -pylibdir = $(shell python -c 'import sys; print sys.path[1]') - EXTRA_DIST = \ test_all.py test_associate.py test_basics.py test_compat.py \ test_dbobj.py test_dbshelve.py test_dbtables.py test_get_none.py \ |