From 2ed22da0d2288591d112e7ab2a35c749737597b2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 10 Jun 2016 02:14:04 +0100 Subject: [PATCH] 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 3f994a3f1..d56e8f94a 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