[adios] 06/10: Ensure all CFLAGS are included in build

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository adios.

commit 5b511845ad4d6c6ad440b52bf4e71ff88b04093f
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 22 16:37:03 2015 +0100

    Ensure all CFLAGS are included in build
---
 debian/changelog | 7 +++++++
 debian/rules     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 458411b..c3ec200 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+adios (1.8.0-2) UNRELEASED; urgency=medium
+
+  * Ensure CFLAGS are included in build
+  * Add Breaks/Replaces/Provides to handle move of /etc/skel.py  
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 22 Jun 2015 15:40:42 +0100
+
 adios (1.8.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/rules b/debian/rules
index d754ea6..3f6b39e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,12 +56,12 @@ override_dh_auto_configure:
 		--with-phdf5-incdir=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-phdf5-libdir=$(LIBDIR)/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
 		--with-bzip2=/usr  --with-zlib=/usr --with-glib=/usr \
-		--prefix=/usr MPIFC=mpif77 CFLAGS=-I$(LIBDIR)/glib-2.0/include \
+		--prefix=/usr MPIFC=mpif77 CFLAGS='$(CFLAGS) -I$(LIBDIR)/glib-2.0/include' \
 LIBS=' -lpthread'
 
 override_dh_auto_build:
 	# First do a build shared, with -fPIC, for the python lib.
-	$(MAKE) -C src CFLAGS='-fPIC' VERBOSE=1 install DESTDIR=$(DESTDIR)
+	$(MAKE) -C src CFLAGS='$(CFLAGS) -fPIC' VERBOSE=1 install DESTDIR=$(DESTDIR)
 	# Need to hack the libs into the right place, to match adios_configs view
 	# as this is then used by setup.py
 	mv debian/tmp/usr/lib/*/*.a debian/tmp/usr/lib

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git