[SCM] x264 packaging branch, master, updated. 0e68cf291dce445ea4a52918705cb355b5b3cdb3

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

The following commit has been merged in the master branch:
commit a878e6b9a4b4ee9bb36c611d0e3a578c8adbfa9d
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jun 15 12:31:04 2009 +0200

    Append to CFLAGS/LDFLAGS instead of overriding.

diff --git a/debian/rules b/debian/rules
index 54f34cf..bb9f32a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,8 @@ endif
 
 confflags = --enable-pthread --prefix=/usr --enable-debug
 
-CFLAGS = -Wall -g
-LDFLAGS = -Wl,--as-needed
+CFLAGS += -Wall -g
+LDFLAGS += -Wl,--as-needed
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0

-- 
x264 packaging