[gdal] 09/10: Use deferred asignment operator for dpkg-architecture call for DEB_HOST_MULTIARCH variable.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository gdal.

commit d7f4cd4fd2a204c2405a5f76e6edd475c7cf42fa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Nov 20 16:05:01 2017 +0100

    Use deferred asignment operator for dpkg-architecture call for DEB_HOST_MULTIARCH variable.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6ee6f6f..0319ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gdal (2.2.3~rc1+dfsg-1) UNRELEASED; urgency=medium
   * Drop svn-r40330_Add-support-for-openjpeg-2.3.patch, included upstream.
   * Strip trailing whitespace from control & changelog files.
   * Add lintian override for debian-watch-uses-insecure-uri.
+  * Use deferred asignment operator for dpkg-architecture call for
+    DEB_HOST_MULTIARCH variable.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 20 Nov 2017 14:19:51 +0100
 
diff --git a/debian/rules b/debian/rules
index 1457694..f64a61a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ GDAL_MINOR=$(word 2,$(GDALVER))
 GDAL_PATCH=$(word 3,$(GDALVER))
 
 ifeq (,$(DEB_HOST_MULTIARCH))
-  DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 endif
 
 ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal.git