From 53efc1e6c4484905a09578011f294a293b1075e6 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Mon, 26 Sep 2011 13:22:17 +0000 Subject: [PATCH] debian/build/tools/perf/Makefile - Workaround file-overwrite in documentation makefile. - Remove debugging output. svn path=/dists/trunk/linux-tools/; revision=18132 --- debian/build/tools/perf/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index 3a5c8cb31..38fa2f43e 100644 --- a/debian/build/tools/perf/Makefile +++ b/debian/build/tools/perf/Makefile @@ -26,7 +26,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sparc64) KERNEL_ARCH_PERF = sparc endif -MAKE_PERF := $(MAKE) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error +MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error $(warning $(KERNEL_ARCH_PERF)) $(warning $(DEB_HOST_ARCH_CPU)) @@ -34,13 +34,17 @@ $(warning $(DEB_HOST_ARCH_CPU)) all: ifdef KERNEL_ARCH_PERF -mkdir out - +$(MAKE_PERF) all man VERSION=$(VERSION) + # upstream makefile is broken + cp -al $(top_srcdir)/tools/perf/Documentation doc + +$(MAKE_PERF) -C $(top_srcdir)/tools/perf O=$(CURDIR)/out all VERSION=$(VERSION) + +$(MAKE_PERF) -C doc man VERSION=$(VERSION) endif install: ifdef KERNEL_ARCH_PERF - +$(MAKE_PERF) install install-man VERSION=$(VERSION) + +$(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 out + rm -rf doc out