From d0d7ab70761cfb1c8e3c267f50755622166de3a7 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Sun, 29 Oct 2017 21:27:10 +0100 Subject: [PATCH] Fixed host OS query in rules - we really want to know the system instead of set it --- debian/changelog | 7 +++++++ debian/rules | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 69ebfcf..adb1b7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lxqt-panel (0.12.0-3) experimental; urgency=medium + + * Fixed host OS query in rules - we really want to know the system + instead of set it + + -- Alf Gaida Sun, 29 Oct 2017 21:27:27 +0100 + lxqt-panel (0.12.0-2) experimental; urgency=medium * Added missed breaks and replaces for lxqt-common << 0.12.0 diff --git a/debian/rules b/debian/rules index e111589..4d4d749 100755 --- a/debian/rules +++ b/debian/rules @@ -5,13 +5,13 @@ export LC_ALL=C.UTF-8 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+all -DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) +WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null) -ifeq ($(DEB_HOST_ARCH_OS), kfreebsd) +ifeq ($(WHICH_OS), kfreebsd) NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO endif -ifeq ($(DEB_HOST_ARCH_OS), hurd) +ifeq ($(WHICH_OS), hurd) NOT_LINUX := -DCPULOAD_PLUGIN=NO -DNETWORKMONITOR_PLUGIN=NO -DVOLUME_PLUGIN=NO -DSENSORS_PLUGIN=NO endif