[X2Go-Commits] [x2gokdrive] 22/28: debian/rules.flags: define NULL variable and use it throughout the file.

[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 x2gokdrive.

commit d52044436bb821fe854b55ee1288c0e66d6d8ab9
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Oct 25 00:05:59 2019 +0200

    debian/rules.flags: define NULL variable and use it throughout the file.
---
 debian/changelog   |  2 ++
 debian/rules.flags | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 076c9fb..b1cabce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,5 +37,7 @@ x2gokdrive (0.0.0.1-0x2go1) UNRELEASED; urgency=medium
     + Avoid xargs, use find's -exec feature.
     + More and better quoting.
     + Verbosely remove *.la files.
+  * debian/rules.flags:
+    + Define NULL variable and use it throughout the file.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 04 Jun 2019 14:10:43 +0200
diff --git a/debian/rules.flags b/debian/rules.flags
index 3e1963c..f86fd2c 100644
--- a/debian/rules.flags
+++ b/debian/rules.flags
@@ -1,3 +1,5 @@
+NULL =
+
 DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 VENDOR = $(shell lsb_release -i -s)
@@ -37,7 +39,8 @@ confflags += \
 	--disable-xnest \
 	--disable-xfake \
 	--disable-xfbdev \
-	--disable-install-setuid
+	--disable-install-setuid \
+	$(NULL)
 
 confflags_main = \
 	--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,built-ins" \
@@ -64,20 +67,22 @@ confflags_main = \
 	--disable-wayland \
 	--with-sha1=libgcrypt \
 	--enable-xcsecurity \
-	$(void)
+	$(NULL)
 
 ifeq ($(DEB_HOST_ARCH_OS), linux)
 	confflags_main += \
 		--disable-dri3 \
 		--disable-xselinux \
 		--disable-systemd-logind \
-		--without-systemd-daemon
+		--without-systemd-daemon \
+		$(NULL)
 else
 	confflags_main += \
 		--disable-dri3 \
 		--disable-xselinux \
 		--disable-systemd-logind \
-		--without-systemd-daemon
+		--without-systemd-daemon \
+		$(NULL)
 endif
 
 ifeq ($(DEB_HOST_ARCH_OS), hurd)

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