From 46a3588d3fca3a5dd702ce6e9b4a108b884a9cf8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 14 Jan 2011 17:20:01 +1100 Subject: waf: use PYTHONARCHDIR for installing python shared libs Pair-Programmed-With: Andrew Bartlett Autobuild-User: Andrew Tridgell Autobuild-Date: Fri Jan 14 08:19:40 CET 2011 on sn-devel-104 --- buildtools/wafsamba/samba_python.py | 2 +- buildtools/wafsamba/wafsamba.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'buildtools') diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py index a663b1910d..e9afa939a3 100644 --- a/buildtools/wafsamba/samba_python.py +++ b/buildtools/wafsamba/samba_python.py @@ -63,7 +63,7 @@ def SAMBA_PYTHON(bld, name, link_name=link_name, pyembed=True, target_type='PYTHON', - install_path='${PYTHONDIR}', + install_path='${PYTHONARCHDIR}', enabled=enabled) Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 571cd480c7..050777fe5d 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -634,8 +634,8 @@ def install_file(bld, destdir, file, chmod=MODE_644, flat=False, if python_fixup: # fixup the python path it will use to find Samba modules inst_file = file + '.inst' - if bld.env["PYTHONDIR"] not in sys.path: - regex = "s|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONDIR}\\2|g" + if bld.env["PYTHONARCHDIR"] not in sys.path: + regex = "s|\(sys.path.insert.*\)bin/python\(.*\)$|\\1${PYTHONARCHDIR}\\2|g" else: # Eliminate updating sys.path if the target python dir is already # in python path. -- cgit