[linux] 02/08: linux-cpupower: Pass variables to cpupower Makefile consistently

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit 2ed22da0d2288591d112e7ab2a35c749737597b2
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Fri Jun 10 02:14:04 2016 +0100

    linux-cpupower: Pass variables to cpupower Makefile consistently
---
 debian/rules.d/tools/power/cpupower/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules.d/tools/power/cpupower/Makefile b/debian/rules.d/tools/power/cpupower/Makefile
index 3f994a3..d56e8f9 100644
--- a/debian/rules.d/tools/power/cpupower/Makefile
+++ b/debian/rules.d/tools/power/cpupower/Makefile
@@ -1,17 +1,17 @@
 include $(top_rulesdir)/Makefile.inc
 
-ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	DEBUG = true
-endif
+MAKE_CPUPOWER := $(shell dpkg-buildflags --export=cmdline) $(MAKE) O=$(CURDIR) CPUFREQ_BENCH=false V=true mandir=/usr/share/man
+
+MAKE_CPUPOWER += DEBUG=$(if $(findstring nostrip,$(DEB_BUILD_OPTIONS)),true,)
 
 all:
-	$(shell dpkg-buildflags --export=cmdline) $(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) DEBUG=$(DEBUG) CPUFREQ_BENCH=false V=true
+	$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower
 
 install:
-	$(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) install mandir=/usr/share/man DESTDIR=$(DESTDIR) CPUFREQ_BENCH=false
+	$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower install DESTDIR=$(DESTDIR)
 ifneq (,$(filter nodoc,$(DEB_BUILD_PROFILES)))
 	rm -rf $(DESTDIR)/usr/share/man
 endif
 
 clean:
-	$(MAKE) -C $(top_srcdir)/tools/power/cpupower O=$(CURDIR) clean
+	$(MAKE_CPUPOWER) -C $(top_srcdir)/tools/power/cpupower clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git