linux-tools: Build perf documentation out-of-tree, as this now works and our previous workaround does not

svn path=/dists/trunk/linux-tools/; revision=20466
This commit is contained in:
Ben Hutchings 2013-08-08 14:20:53 +00:00
parent c92d538900
commit 48eaa7bab4
2 changed files with 6 additions and 6 deletions

View File

@ -36,18 +36,14 @@ MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=
all:
ifdef KERNEL_ARCH_PERF
-mkdir out
# upstream makefile is broken
cp -al $(top_srcdir)/tools/perf/Documentation doc
cp -al $(top_srcdir)/tools/perf/config config
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out all VERSION=$(VERSION)
+$(MAKE_PERF) -C doc man VERSION=$(VERSION)
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf/Documentation O=$(CURDIR)/out man VERSION=$(VERSION)
endif
install:
ifdef KERNEL_ARCH_PERF
+$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out install VERSION=$(VERSION)
+$(MAKE_PERF) -C doc install-man VERSION=$(VERSION)
endif
clean:
rm -rf config doc out
rm -rf out

4
debian/changelog vendored
View File

@ -2,6 +2,10 @@ linux-tools (3.11~rc4-1~exp1) UNRELEASED; urgency=low
* New upstream release candidate
[ Ben Hutchings ]
* linux-tools: Build perf documentation out-of-tree, as this now works
and our previous workaround does not
-- Ben Hutchings <ben@decadent.org.uk> Thu, 08 Aug 2013 15:39:50 +0200
linux-tools (3.10-2) unstable; urgency=low