summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-01-14 17:20:01 +1100
committerAndrew Tridgell <tridge@samba.org>2011-01-14 08:19:39 +0100
commit46a3588d3fca3a5dd702ce6e9b4a108b884a9cf8 (patch)
treec4209afbd60fad2d4c9f4d0f046541ce5e406484 /source4
parent0346b5b93c5215ecb8a56c664d99fc700ca23bfb (diff)
downloadsamba-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 'source4')
-rw-r--r--source4/dynconfig/dynconfig.c1
-rw-r--r--source4/dynconfig/dynconfig.h1
-rw-r--r--source4/dynconfig/wscript3
-rw-r--r--source4/scripting/python/modules.c4
-rw-r--r--source4/wscript2
5 files changed, 10 insertions, 1 deletions
diff --git a/source4/dynconfig/dynconfig.c b/source4/dynconfig/dynconfig.c
index 0c23452cc3..9fbfed0543 100644
--- a/source4/dynconfig/dynconfig.c
+++ b/source4/dynconfig/dynconfig.c
@@ -92,4 +92,5 @@ DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR)
DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
+DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
diff --git a/source4/dynconfig/dynconfig.h b/source4/dynconfig/dynconfig.h
index c7590813a4..579f45b3f1 100644
--- a/source4/dynconfig/dynconfig.h
+++ b/source4/dynconfig/dynconfig.h
@@ -56,4 +56,5 @@ DEFINE_DYN_CONFIG_PROTO(WINBINDD_SOCKET_DIR)
DEFINE_DYN_CONFIG_PROTO(WINBINDD_PRIVILEGED_SOCKET_DIR)
DEFINE_DYN_CONFIG_PROTO(NTP_SIGND_SOCKET_DIR)
DEFINE_DYN_CONFIG_PROTO(PYTHONDIR)
+DEFINE_DYN_CONFIG_PROTO(PYTHONARCHDIR)
DEFINE_DYN_CONFIG_PROTO(SCRIPTSBINDIR)
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 375d4a14ea..0058047182 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -32,6 +32,7 @@ dyn_cflags = {
'NTP_SIGND_SOCKET_DIR' : '${NTP_SIGND_SOCKET_DIR}',
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
'PYTHONDIR' : '${PYTHONDIR}',
+ 'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
'MODULESDIR' : '${PREFIX}/modules',
'INCLUDEDIR' : '${PREFIX}/include',
'PKGCONFIGDIR' : '${LIBDIR}/pkgconfig',
@@ -62,7 +63,7 @@ dyn_cflags_fhs = {
'WINBINDD_PRIVILEGED_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/winbindd_privileged',
'NTP_SIGND_SOCKET_DIR' : '${LOCALSTATEDIR}/run/samba/ntp_signd',
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
- 'PYTHONDIR' : '${PYTHONDIR}',
+ 'PYTHONARCHDIR' : '${PYTHONARCHDIR}',
'MODULESDIR' : '${LIBDIR}/samba',
'LIBEXECDIR' : '${MODULESDIR}',
'INCLUDEDIR' : '${INCLUDEDIR}/samba-4.0',
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 18253758b8..960239e863 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -50,6 +50,10 @@ bool py_update_path(const char *bindir)
return false;
}
+ if (!PySys_PathPrepend(py_path, dyn_PYTHONARCHDIR)) {
+ return false;
+ }
+
if (!PySys_PathPrepend(py_path, dyn_PYTHONDIR)) {
return false;
}
diff --git a/source4/wscript b/source4/wscript
index 8c1bc71f9e..3fdeb3c14e 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -122,6 +122,8 @@ def configure(conf):
# we don't want PYTHONDIR in config.h, as otherwise changing
# --prefix causes a complete rebuild
del(conf.env.defines['PYTHONDIR'])
+ del(conf.env.defines['PYTHONARCHDIR'])
+
conf.SAMBA_CONFIG_H('include/config.h')