Remove PYTHONDIR and PYTHONARCHDIR in a single place

diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index fb378ae071aa7848f19f100641d8007ac4c50235..7546bbd6d2e7c28aad06c42e8e9068e473e52941 100644 (file)
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -55,6 +55,10 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
     else:
         conf.msg("python headers", "using cache")
 
+    # 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'])
 
 def _check_python_headers(conf, mandatory):
     conf.check_python_headers(mandatory=mandatory)

diff --git a/ctdb/wscript b/ctdb/wscript
index b5c6087661e8d0f968ed6f90bc6e2e14ad38140c..956175070c71440d50646b25f5f8fdfe4e36eda8 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -212,9 +212,6 @@ def configure(conf):
             conf.ADD_EXTRA_INCLUDES('#ctdb')
         conf.ADD_EXTRA_INCLUDES('#lib #lib/replace')
 
-        del(conf.env.defines['PYTHONDIR'])
-        del(conf.env.defines['PYTHONARCHDIR'])
-
         conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
         conf.DEFINE('SAMBA_UTIL_CORE_ONLY', 1, add_to_cflags=True)
         conf.SAMBA_CONFIG_H()

diff --git a/wscript b/wscript
index 7700c3219bb84483c80464453d0ce58121172b04..a84e5d5661b218819cec2e945bf9f7db9d7db82b 100644 (file)
--- a/wscript
+++ b/wscript
@@ -172,11 +172,6 @@ def configure(conf):
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)
 
-    # 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'])
-
     if not conf.CHECK_CODE('#include "tests/summary.c"',
                            define='SUMMARY_PASSES',
                            addmain=False,