ctdb-build: Fix includes for SAMBA_BINARY()s

No need for "..", since the correct thing is generated.  Add "include"
and "include/internal" where missing.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/wscript b/ctdb/wscript
index d185e7135a6e2d65ff922a68002c2b007f05b228..4854198d06014a5747e1416a324b2e99394bb320 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -276,6 +276,7 @@ def build(bld):
                      source='tools/ctdb.c tools/ctdb_vacuum.c',
                      deps='''ctdb-client ctdb-common ctdb-common-util
                              ctdb-system''',
+                     includes='include include/internal',
                      install_path='${BINDIR}',
                      manpages='doc/ctdb.1')
 
@@ -289,6 +290,7 @@ def build(bld):
     bld.SAMBA_BINARY('ctdb_lock_helper',
                      source='server/ctdb_lock_helper.c',
                      deps='ctdb-util ctdb-util-misc ctdb-common-util talloc tdb',
+                     includes='include include/internal',
                      install_path='${BINDIR}')
 
     bld.SAMBA_BINARY('ctdb_event_helper',
@@ -443,6 +445,7 @@ def build(bld):
 
         bld.SAMBA_BINARY(target,
                          source=src,
+                         includes='include include/internal',
                          deps='''ctdb-client ctdb-common ctdb-common-util
                                  ctdb-system''',
                          install_path='${CTDB_TEST_LIBDIR}')
@@ -451,19 +454,19 @@ def build(bld):
                      source='tests/src/ctdb_takeover_tests.c',
                      deps='replace popt tdb tevent talloc ctdb-system' +
                           ib_deps,
-                     includes='../include ../include/internal lib/util',
+                     includes='include include/internal lib/util',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_functest',
                      source='tests/src/ctdb_functest.c',
                      deps='replace tdb tevent talloc popt ctdb-system',
-                     includes='../include ../include/internal lib/util',
+                     includes='include include/internal lib/util',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_stubtest',
                      source='tests/src/ctdb_test.c',
                      deps='replace tdb tevent talloc popt ctdb-system',
-                     includes='../include ../include/internal lib/util',
+                     includes='include include/internal lib/util',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     if bld.env.HAVE_INFINIBAND: