- python: avoid invoking python to acquire ill-specified parameters.

CVS patchset: 7060
CVS date: 2004/01/01 17:49:17

diff --git a/CHANGES b/CHANGES
index 5b62e852140e37f1c37a062563872fb93de0aba3..9e103dbf5ef53ecfa3891f92dcb44af1c6eeca2f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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 300a6a07c92dfec4ba2b9b93c33fc1df8b98cbea..75ef6d0eb01f1be19973ba349e131c92637b5d95 100644 (file)
--- 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 a6cbc75e8a87c03fd9b428acdf1eed343a7b9c67..75943417f2dc67ae070043905ce9d91908946845 100644 (file)
--- 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 667ad87c83921675d925d637301c43fe6be30d1e..705cec6113e6d26c6def6ff1f00deb31a8cd8ef1 100644 (file)
--- 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 \