From bab349c2a1d51409900f05144324d3da5dce4e99 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 27 Aug 2014 10:10:34 +0200 Subject: [PATCH] ctdb/wscript: pass dep_vars=['VERSION'] to SAMBA_GENERATOR() This avoid the use of always=True. Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- ctdb/wscript | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/ctdb/wscript b/ctdb/wscript index 9c7d697aa70..9fc9671c6ed 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