diff options
author | Tim Gardner <tim.gardner@canonical.com> | 2011-08-09 10:52:25 -0600 |
---|---|---|
committer | Linaro CI <john.rigby@linaro.org> | 2012-02-07 22:47:22 +0000 |
commit | c7baf7efc8a3930f2bd9c6b930c46c7161d06f4a (patch) | |
tree | 3fb8c2d10e68db3f529d850f4d06656c8363d686 /debian/rules.d | |
parent | 597d22216f5019274430c469596d55e8ae946b23 (diff) |
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/rules.d')
-rw-r--r-- | debian/rules.d/2-binary-arch.mk | 14 |
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 |