git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad04275)
ctdb-build: Use wafsamba's INSTALL_DIR()
authorMartin Schwenke <martin@meltin.net>
Sun, 9 Sep 2018 10:34:31 +0000 (20:34 +1000)
committerAlexander Bokovoy <ab@samba.org>
Tue, 11 Sep 2018 04:59:11 +0000 (06:59 +0200)
install_dir() doesn't work (doesn't respect $DESTDIR) and is only
available for backward compatibilty.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
ctdb/wscript patch | blob | history

diff --git a/ctdb/wscript b/ctdb/wscript
index 59deb8cce0913b91b1be97f0b18f9f18e0d7066a..06cc1542f784ce2fab587df96c90d6c799ea4570 100644 (file)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -861,12 +861,12 @@ def build(bld):
                       'config/notification.README',
                       destname='README')
 
-    bld.install_dir(bld.env.CTDB_LOGDIR)
-    bld.install_dir(bld.env.CTDB_RUNDIR)
-    bld.install_dir(bld.env.CTDB_VARDIR)
+    bld.INSTALL_DIR(bld.env.CTDB_LOGDIR)
+    bld.INSTALL_DIR(bld.env.CTDB_RUNDIR)
+    bld.INSTALL_DIR(bld.env.CTDB_VARDIR)
 
     for d in ['volatile', 'persistent', 'state']:
-        bld.install_dir(os.path.join(bld.env.CTDB_VARDIR, d))
+        bld.INSTALL_DIR(os.path.join(bld.env.CTDB_VARDIR, d))
 
     bld.SAMBA_BINARY('errcode',
                      source='tests/src/errcode.c',
Samba Shared Repository