[SCM] sndobj/master: Update flags handling

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 21b365c10a29cf911e608f0a9da16db2f54816ae
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Nov 28 01:59:52 2016 +0100

    Update flags handling

diff --git a/debian/rules b/debian/rules
index dfffc19..d51136e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,13 @@
 #!/usr/bin/make -f
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/buildflags.mk
+
+sconsflags  = customLIBS=pthread
+sconsflags += customLIBPATH=/usr/lib/$(DEB_HOST_MULTIARCH)
+sconsflags += customCCFLAGS="$(CPPFLAGS) $(CFLAGS)"
+sconsflags += customCXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
+sconsflags += customSHLINKFLAGS="$(LDFLAGS)"
 
 %:
 	dh $@
@@ -12,9 +19,9 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	mkdir lib
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-	scons ALSA=true OSS=false JACK=true customLIBS=pthread customLIBPATH=/usr/lib/$(DEB_HOST_MULTIARCH)
+	scons ALSA=true OSS=false JACK=true $(sconsflags)
 else
-	scons ALSA=false OSS=true JACK=false customLIBS=pthread customLIBPATH=/usr/lib/$(DEB_HOST_MULTIARCH)
+	scons ALSA=false OSS=true JACK=false $(sconsflags)
 endif
 
 override_dh_install:

-- 
sndobj packaging