aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-10-06 15:44:12 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-10-06 15:44:12 +0000
commit6cb29f2ce2b190707d2121e97234411b45fe948c (patch)
treed0705bddc9066d4956158273d85c2c5e761be889
parent7f860a772a8ecbd83dee8934ff0765dd14ea0c4c (diff)
downloadrpm-setup-6cb29f2ce2b190707d2121e97234411b45fe948c.tar
rpm-setup-6cb29f2ce2b190707d2121e97234411b45fe948c.tar.gz
rpm-setup-6cb29f2ce2b190707d2121e97234411b45fe948c.tar.bz2
rpm-setup-6cb29f2ce2b190707d2121e97234411b45fe948c.tar.xz
rpm-setup-6cb29f2ce2b190707d2121e97234411b45fe948c.zip
%_lib independent fixes to %py_* macros, use distutils
-rw-r--r--macros.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/macros.in b/macros.in
index 50f3efb..8dd3403 100644
--- a/macros.in
+++ b/macros.in
@@ -543,9 +543,9 @@ Internationalization and locale data for %{?1:%{1}}%{?!1:%{name}}\
#
%py_ver %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND)
%py_prefix %(python -c "import sys; print sys.prefix" 2>/dev/null || echo PYTHON-NOT-FOUND)
-%py_libdir %{py_prefix}/%_lib/python%{py_ver}
-%py_incdir %{py_prefix}/include/python%{py_ver}
-%py_sitedir %{py_libdir}/site-packages
+%py_libdir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0,1)' 2>/dev/null || echo PYTHON-LIBDIR-NOT-FOUND)
+%py_incdir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()' 2>/dev/null || echo PYTHON-INCLUDEDIR-NOT-FOUND)
+%py_sitedir %(python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()' 2>/dev/null || echo PYTHON-SITEDIR-NOT-FOUND)
%py_compile(O) \
find %1 -name '*.pyc' -exec rm -f {} \\; \
python -c "import sys, os, compileall; br='%{buildroot}'; compileall.compile_dir(sys.argv[1], ddir=br and (sys.argv[1][len(os.path.abspath(br)):]+'/') or None)" %1 \