UBUNTU: [Config] Clean intermediate directories to make builds repeatable

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 9b9123b..5627af5 100644 (file)
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -351,6 +351,7 @@ $(stampdir)/stamp-flavours:
 $(stampdir)/stamp-prepare-perarch:
        @echo "Preparing perarch ..."
 ifeq ($(do_tools),true)
+       rm -rf $(builddir)/tools-$*
        install -d $(builddir)/tools-$*
        for i in *; do ln -s $(CURDIR)/$$i $(builddir)/tools-$*/; done
        rm $(builddir)/tools-$*/tools

diff --git a/debian/rules.d/3-binary-indep.mk b/debian/rules.d/3-binary-indep.mk
index 793e1e9..d929bd5 100644 (file)
--- a/debian/rules.d/3-binary-indep.mk
+++ b/debian/rules.d/3-binary-indep.mk
@@ -86,6 +86,7 @@ install-tools:
 
        install -m755 debian/tools/perf $(toolsbin)/perf
 
+       rm -rf $(builddir)/tools
        install -d $(builddir)/tools
        for i in *; do ln -s $(CURDIR)/$$i $(builddir)/tools/; done
        rm $(builddir)/tools/tools