[med-svn] [SCM] ray branch, master, updated. 57986b3f63d0eb9537ceece13eddb137ec158a91

[Sébastien Boisvert]

The following commit has been merged in the master branch:
commit da2d90bd2c677c8cf86cc874d82f7b370a89f7ea
Author: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>
Date:   Tue Nov 13 19:05:00 2012 -0500

    Fixed hardening-no-relro
    
    Signed-off-by: Sébastien Boisvert <sebastien.boisvert.3 at ulaval.ca>

diff --git a/debian/rules b/debian/rules
index f37eb3d..01e4b42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,16 +4,20 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+CXXFLAGS=$(shell dpkg-buildflags --get CXXFLAGS)
+CXXFLAGS+=-I. -I../RayPlatform -DHAVE_LIBZ -DHAVE_LIBBZ2 
+CXXFLAGS+=-DRAY_VERSION=\\\\\\\"2.1.0\\\\\\\" 
+
 %:
 	dh $@ 
 
 override_dh_auto_clean :
-	dh_auto_clean --  HAVE_LIBZ=y HAVE_LIBBZ2=y
+	dh_auto_clean -- HAVE_LIBZ=y HAVE_LIBBZ2=y
 	rm -rf install-prefix
 	rm -f README.Ray  README.RayPlatform
 
 override_dh_auto_build :
-	dh_auto_build -- HAVE_LIBZ=y HAVE_LIBBZ2=y
+	dh_auto_build -- CXXFLAGS="$(CXXFLAGS)" HAVE_LIBBZ2=y HAVE_LIBZ=y
 	#Rename 2 docs to make more sence in package context
 	cp README.md README.Ray
 	cp RayPlatform/README README.RayPlatform

-- 
Packaging of Ray in Debian