From 33487d09a4b9c55f89cd45006644cd3ca78f01e8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 10 Feb 2019 13:04:12 +0100 Subject: Correcting makefile conditionals for netdata-core-no-sse handling in rules again to make them actually work. Signed-off-by: Daniel Baumann --- debian/rules | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/rules b/debian/rules index 61afbe0e8..8cf73594a 100755 --- a/debian/rules +++ b/debian/rules @@ -50,7 +50,7 @@ override_dh_auto_configure: cp -a tests build-core cp -a web/gui/src build-core/web/gui -ifneq (,,$(findstring no-sse,$(PACKAGES))) +ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) mkdir -p build-core-no-sse dh_auto_configure -B build-core-no-sse -- --libdir=/usr/lib --libexecdir=/usr/lib --disable-x86-sse --disable-plugin-freeipmi --with-math cp -a tests build-core-no-sse @@ -60,14 +60,14 @@ endif override_dh_auto_build: dh_auto_build -B build-core -ifneq (,,$(findstring no-sse,$(PACKAGES))) +ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) dh_auto_build -B build-core-no-sse endif override_dh_auto_install: dh_auto_install -B build-core -- DESTDIR=$(CURDIR)/debian/tmp -ifneq (,,$(findstring no-sse,$(PACKAGES))) +ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) dh_auto_install -B build-core-no-sse -- DESTDIR=$(CURDIR)/debian/tmp-core-no-sse endif @@ -85,7 +85,7 @@ override_dh_install-arch: $(TOP)-core/usr/lib/netdata/plugins.d; \ done -ifneq (,,$(findstring no-sse,$(PACKAGES))) +ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) find debian/tmp-core-no-sse -name .keep -delete dh_install -p netdata-core-no-sse --sourcedir=debian/tmp-core-no-sse @@ -159,7 +159,7 @@ override_dh_fixperms-arch: # given extra capabilities in the postinst script. chmod 0754 $(TOP)-core/usr/lib/netdata/plugins.d/apps.plugin chmod 4754 $(TOP)-core/usr/lib/netdata/plugins.d/freeipmi.plugin -ifneq (,,$(findstring no-sse,$(PACKAGES))) +ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) chmod 0754 $(TOP)-core-no-sse/usr/lib/netdata/plugins.d/apps.plugin chmod 4754 $(TOP)-core-no-sse/usr/lib/netdata/plugins.d/freeipmi.plugin endif -- cgit v1.2.3