summaryrefslogtreecommitdiffstats
path: root/ctdb/wscript
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2014-08-27 10:10:34 +0200
committerStefan Metzmacher <metze@samba.org>2014-09-05 19:47:06 +0200
commitbab349c2a1d51409900f05144324d3da5dce4e99 (patch)
tree769f2f5c933bed4cb6d61754078baa9465f8b984 /ctdb/wscript
parenta41a9ad0749755d612df81bb77384b4f479e1af2 (diff)
downloadsamba-bab349c2a1d51409900f05144324d3da5dce4e99.tar.gz
samba-bab349c2a1d51409900f05144324d3da5dce4e99.tar.xz
samba-bab349c2a1d51409900f05144324d3da5dce4e99.zip
ctdb/wscript: pass dep_vars=['VERSION'] to SAMBA_GENERATOR()
This avoid the use of always=True. Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'ctdb/wscript')
-rwxr-xr-xctdb/wscript19
1 files changed, 11 insertions, 8 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index 9c7d697aa7..9fc9671c6e 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -171,10 +171,11 @@ def build(bld):
bld.RECURSE('lib/tdb')
bld.RECURSE('lib/socket_wrapper')
- bld.SAMBA_GENERATOR('ctdb-version-header',
- target='include/ctdb_version.h',
- rule='../packaging/mkversion.sh ${TGT} %s' % (VERSION),
- always=True)
+ t = bld.SAMBA_GENERATOR('ctdb-version-header',
+ target='include/ctdb_version.h',
+ rule='../packaging/mkversion.sh ${TGT} %s' % (VERSION),
+ dep_vars=['VERSION'])
+ t.env.VERSION = VERSION
bld.SAMBA_SUBSYSTEM('ctdb-util',
source=bld.SUBDIR('lib/util',
@@ -414,10 +415,12 @@ def build(bld):
bld.install_dir(bld.env.CTDB_VARDIR)
sed_expr = 's/@PACKAGE_VERSION@/%s/g' % VERSION
- bld.SAMBA_GENERATOR('ctdb-pc',
- source='ctdb.pc.in',
- target='ctdb.pc',
- rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr)
+ t = bld.SAMBA_GENERATOR('ctdb-pc',
+ source='ctdb.pc.in',
+ target='ctdb.pc',
+ rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr,
+ dep_vars=['VERSION'])
+ t.env.VERSION = VERSION
bld.INSTALL_FILES('${LIBDIR}/pkgconfig', 'ctdb.pc')
# Test binaries