diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-01-14 17:20:01 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-01-14 08:19:39 +0100 |
| commit | 46a3588d3fca3a5dd702ce6e9b4a108b884a9cf8 (patch) | |
| tree | c4209afbd60fad2d4c9f4d0f046541ce5e406484 /buildtools | |
| parent | 0346b5b93c5215ecb8a56c664d99fc700ca23bfb (diff) | |
| download | samba-46a3588d3fca3a5dd702ce6e9b4a108b884a9cf8.tar.gz samba-46a3588d3fca3a5dd702ce6e9b4a108b884a9cf8.tar.bz2 samba-46a3588d3fca3a5dd702ce6e9b4a108b884a9cf8.zip | |
waf: use PYTHONARCHDIR for installing python shared libs
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Fri Jan 14 08:19:40 CET 2011 on sn-devel-104
Diffstat (limited to 'buildtools')
| -rw-r--r-- | buildtools/wafsamba/samba_python.py | 2 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 4 |
2 files changed, 3 insertions, 3 deletions
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. |