aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorTim Gardner <tim.gardner@canonical.com>2011-08-09 10:52:25 -0600
committerJohn Rigby <john.rigby@linaro.org>2011-11-16 14:25:53 -0700
commitb2471a841cef2c3b00e67b4fe715eb4d38594200 (patch)
treec04d1d7436ebb4fe84ee7251410fa3d63b740ff3 /debian
parentd4f06454c4be9a9c794b3c0e8873b8424f1ffb2d (diff)
downloadlinux-linaro-precise-b2471a841cef2c3b00e67b4fe715eb4d38594200.tar.gz
UBUNTU: [Config] Clean up tools rules
There is no stem '$*' with which to match the automatic variable '%'. Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Diffstat (limited to 'debian')
-rw-r--r--debian/rules.d/2-binary-arch.mk14
1 files 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