From 5c36ba14a43730329fe3518efce88e5b54b88296 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Tue, 9 Aug 2011 10:52:25 -0600 Subject: UBUNTU: [Config] Clean up tools rules There is no stem '$*' with which to match the automatic variable '%'. Signed-off-by: Tim Gardner Signed-off-by: Leann Ogasawara --- debian/rules.d/2-binary-arch.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index c1515423fbc..c16459bab85 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -355,17 +355,17 @@ $(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 - rsync -a tools/ $(builddir)/tools-$*/tools/ + rm -rf $(builddir)/tools + install -d $(builddir)/tools + for i in *; do ln -s $(CURDIR)/$$i $(builddir)/tools/; done + rm $(builddir)/tools/tools + rsync -a tools/ $(builddir)/tools/tools/ endif touch $@ $(stampdir)/stamp-build-perarch: prepare-perarch ifeq ($(do_tools),true) - cd $(builddir)/tools-$*/tools/perf && make $(CROSS_COMPILE) + cd $(builddir)/tools/tools/perf && make $(CROSS_COMPILE) endif @touch $@ @@ -374,7 +374,7 @@ install-perarch: $(stampdir)/stamp-build-perarch # Add the tools. ifeq ($(do_tools),true) install -d $(toolspkgdir)/usr/bin - install -s -m755 $(builddir)/tools-$*/tools/perf/perf \ + install -s -m755 $(builddir)/tools/tools/perf/perf \ $(toolspkgdir)/usr/bin/perf_$(abi_release) endif -- cgit v1.2.3