[X2Go-Commits] [pale-moon] 03/03: debian/rules: we really want to match the search pattern against the current DIST variable and have the result contain the DIST variable's content if the needle strings match, so change the filter call parameter order.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository pale-moon.

commit 361533c93c27318f5aa3f3286aeb7c91bdf4b95f
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Aug 30 05:06:42 2018 +0200

    debian/rules: we really want to match the search pattern against the current DIST variable and have the result contain the DIST variable's content if the needle strings match, so change the filter call parameter order.
---
 debian/changelog | 3 +++
 debian/rules     | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 38fae2f..88d9e19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,9 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium
     - Ignore js/src/build/autoconf/config.{guess,sub} if they do not exist.
     - Use gcc-6 on newer distro versions, and gcc-4.9 on older ones. Switch to
       using the DIST variable since we have that now.
+    - We really want to match the search pattern against the current DIST
+      variable and have the result contain the DIST variable's content if the
+      needle strings match, so change the filter call parameter order.
   * debian/mozconfig:
     - Remove autoconf flags that should better be handled by debian/rules.
   * debian/make.mk:
diff --git a/debian/rules b/debian/rules
index 6c5b9ac..f28fe85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -39,13 +39,13 @@ LDFLAGS += -Wl,--no-keep-memory
 LDFLAGS += -Wl,--stats
 
 # Build with gcc-6 on Buster, Sid, Artful, Bionic and Cosmic.
-ifeq ($(DIST),$(filter $(DIST),buster sid artful bionic cosmic))
+ifeq ($(DIST),$(filter buster sid artful bionic cosmic,$(DIST)))
 export CC=gcc-6
 export CXX=g++-6
 export CPP=cpp-6
 export LD=gcc-6
 # Build with gcc-4.9 on Jessie, Xenial and Horizon.
-else ifeq ($(DIST),$(filter $(DIST),jessie xenial Horizon))
+else ifeq ($(DIST),$(filter jessie xenial Horizon,$(DIST)))
 export CC=gcc-4.9
 export CXX=g++-4.9
 export CPP=cpp-4.9

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git