From 85aba07cc0f005b3af210fb64e2dafe6e93c2c17 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 20 Mar 2016 20:08:08 +0000 Subject: [PATCH] Simplify make rules for cpupower --- debian/rules.d/tools/power/cpupower/Makefile | 14 ++++---------- debian/rules.real | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/debian/rules.d/tools/power/cpupower/Makefile b/debian/rules.d/tools/power/cpupower/Makefile index 66e2c75aa..79b131430 100644 --- a/debian/rules.d/tools/power/cpupower/Makefile +++ b/debian/rules.d/tools/power/cpupower/Makefile @@ -1,20 +1,14 @@ -OUTDIR = tools/power/cpupower -prefix = /usr/sbin - -include ../../../Makefile.inc +include $(top_rulesdir)/Makefile.inc ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) DEBUG = true endif all: - mkdir out - $(shell dpkg-buildflags --export=cmdline) $(MAKE) -C $(top_srcdir)/tools/power/cpupower -f Makefile O=$(CURDIR)/out DEBUG=$(DEBUG) CPUFREQ_BENCH=false V=true + $(shell dpkg-buildflags --export=cmdline) $(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) DEBUG=$(DEBUG) CPUFREQ_BENCH=false V=true install: - $(MAKE) -C $(top_srcdir)/tools/power/cpupower -f Makefile O=$(CURDIR)/out install mandir=/usr/share/man DESTDIR=$(DESTDIR) CPUFREQ_BENCH=false + $(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) install mandir=/usr/share/man DESTDIR=$(DESTDIR) CPUFREQ_BENCH=false clean: - mkdir -p out - $(MAKE) -C $(top_srcdir)/tools/power/cpupower -f Makefile O=$(CURDIR)/out clean - rm -rf out + $(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) clean diff --git a/debian/rules.real b/debian/rules.real index 6338c7091..52833514c 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -54,7 +54,7 @@ install-cpupower: $(STAMPS_DIR)/build dh_testdir dh_testroot dh_prep - $(MAKE) -C $(BUILD_DIR)/tools/power/cpupower install top_srcdir=$(CURDIR) DESTDIR=$(DIR) + $(call submake,tools/power/cpupower) install DESTDIR=$(DIR) dh_install --sourcedir=$(DIR) dh_installchangelogs dh_installdocs