[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2224-5

[Simon McVittie]

The following commit has been merged in the master branch:
commit e3e823861bc2df36de44f14bbc77e1db68292cc6
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Jun 15 09:21:24 2012 +0100

    Add CPPFLAGS (which are not followed by ioquake3) to CFLAGS (which are), for better hardening

diff --git a/debian/changelog b/debian/changelog
index ee83339..8c6c0e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ioquake3 (1.36+svn2224-5) UNRELEASED; urgency=low
 
   * Add bug number to the previous upload's changelog
+  * Add CPPFLAGS (which are not followed by ioquake3) to CFLAGS (which are),
+    for better hardening
 
  -- Simon McVittie <smcv at debian.org>  Fri, 15 Jun 2012 09:11:41 +0100
 
diff --git a/debian/rules b/debian/rules
index caa1f76..2b3f339 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ Q3COMPILE_ARCH     := $(shell $(CURDIR)/debian/q3arch arch     BUILD)
 Q3COMPILE_PLATFORM := $(shell $(CURDIR)/debian/q3arch platform BUILD)
 distro             := $(shell lsb_release -is)
 
-CFLAGS += -fsigned-char -DWITH_OPENARENA
+CFLAGS += -fsigned-char -DWITH_OPENARENA $(CPPFLAGS)
 
 %:
 	dh $@ --parallel

-- 
Quake 3 engine