[SCM] xvidcore/master: Simplify setting of CFLAGS.

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

The following commit has been merged in the master branch:
commit 69901060499070b3ad8635e1f6e9b8776872e5b0
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Tue May 3 18:26:54 2011 -0400

    Simplify setting of CFLAGS.

diff --git a/debian/rules b/debian/rules
index d06e449..69e83fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 # Set CFLAGS from DEB_CFLAGS if defined, otherwise let xvidcore's build system
 # set CFLAGS to use.
-CFLAGS = $(or $(DEB_CFLAGS),)
+CFLAGS = $(DEB_CFLAGS)
 
 %:
 	dh $@ --sourcedirectory=build/generic \

-- 
xvidcore packaging