From 14c1301180c4fdf74f1344f47552b90d3560d26b Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Sat, 25 Feb 2017 05:51:00 +1100 Subject: [PATCH 1/2] ctdb-build: Add WAFLOCK magic to manpages target BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595 Without this a top-level "make dist" fails to build the CTDB manpages. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs (cherry picked from commit e458bdd7d26bc9cd9749398130ae23227894773f) --- ctdb/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ctdb/Makefile b/ctdb/Makefile index 23ee780..10ac9ab 100644 --- a/ctdb/Makefile +++ b/ctdb/Makefile @@ -28,7 +28,8 @@ show_version: @WAFLOCK=.tmplock $(WAF) show_version manpages: - $(WAF) manpages + touch .tmplock + WAFLOCK=.tmplock $(WAF) manpages dist: touch .tmplock -- 2.9.3 From c339c81faa4fe5bdd4bc3b6d0b7791c785bf315a Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Sat, 25 Feb 2017 13:04:45 +1100 Subject: [PATCH 2/2] ctdb-build: Fix RPM build BUG: https://bugzilla.samba.org/show_bug.cgi?id=12595 It doesn't look like recursion works for appending scripting commands. Unroll the recursion instead. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Mon Feb 27 03:09:27 CET 2017 on sn-devel-144 (cherry picked from commit 7dbc5bbd60b1c0f32366ad5373ed13aee17f7050) --- ctdb/wscript | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ctdb/wscript b/ctdb/wscript index d23358b..fe7d712 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -1025,7 +1025,8 @@ def rpmonly(ctx): def rpm(ctx): import Scripting - Scripting.commands.append('dist') + Scripting.commands.append('manpages') + Scripting.commands.append('distonly') Scripting.commands.append('rpmonly') -- 2.9.3