[patch] rpm-4.2.1-python2.3.patch

rpm-4.2.1-python2.3.patch (text/plain), 1.44 KB, created by Vaclav Slavik on 2004-01-24 13:25:52 UTC

diff -ru rpm-4.2.1/python/Makefile.in rpm-4.2.1.new/python/Makefile.in
--- rpm-4.2.1/python/Makefile.in	2003-07-16 19:05:47.000000000 +0200
+++ rpm-4.2.1.new/python/Makefile.in	2004-01-24 21:38:59.000000000 +0100
@@ -258,7 +258,8 @@
 
 PYVER = @WITH_PYTHON_VERSION@
 
-pylibdir = $(shell python -c 'import sys; print sys.path[1]')
+
+pythondir = $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)')
 pyincdir = $(prefix)/include/python${PYVER}
 
 SUBDIRS = rpmdb test
@@ -291,10 +292,9 @@
 
 LDADD = 
 
-pythondir = $(pylibdir)/site-packages
 python_PROGRAMS = rpmmodule.so
 
-rpmdbdir = $(pylibdir)/site-packages/rpmdb
+rpmdbdir = $(pythondir)/rpmdb
 rpmdb_PROGRAMS = _rpmdb.so
 
 noinst_PROGRAMS = poptmodule.so
diff -ru rpm-4.2.1/python/rpmdb/Makefile.in rpm-4.2.1.new/python/rpmdb/Makefile.in
--- rpm-4.2.1/python/rpmdb/Makefile.in	2003-07-16 19:05:47.000000000 +0200
+++ rpm-4.2.1.new/python/rpmdb/Makefile.in	2004-01-24 22:06:07.000000000 +0100
@@ -256,13 +256,13 @@
 
 PYVER = @WITH_PYTHON_VERSION@
 
-pylibdir = $(shell python -c 'import sys; print sys.path[1]')
+pythondir = $(shell python -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1,0)')
 
 EXTRA_DIST = \
 	__init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py
 
 
-rpmdbdir = $(pylibdir)/site-packages/rpmdb
+rpmdbdir = $(pythondir)/rpmdb
 rpmdb_SCRIPTS = \
 	__init__.py dbobj.py db.py dbrecio.py dbshelve.py dbtables.py dbutils.py