[SCM] x264/master: Make CFLAGS assignment more elegant as suggested by Jonas.

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e835614c836f08d071424783c4a0c12c7aa4542
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Oct 27 18:21:23 2010 -0400

    Make CFLAGS assignment more elegant as suggested by Jonas.

diff --git a/debian/confflags b/debian/confflags
index c30ec40..00cb9ab 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -3,10 +3,7 @@
 # configure flags logic
 
 # Set CFLAGS from DEB_CFLAGS if defined, otherwise simply add -Wall
-CFLAGS = $(shell test -z "$$DEB_CFLAGS" || echo "$$DEB_CFLAGS")
-ifeq (,$(CFLAGS))
-  CFLAGS = -Wall
-endif
+CFLAGS = $(or $(DEB_CFLAGS),-Wall)
 
 common_confflags += --prefix=/usr
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))

-- 
x264 packaging