[silo-llnl] 79/96: Avoid calling make all in install step, too

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit d38fa183463a0b1f8aa0337bee99cf8852049eda
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu May 1 20:56:02 2014 +0100

    Avoid calling make all in install step, too
---
 debian/rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 93ee780..a846663 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ endif
 
 # QT version 4 or 5
 QT:=qt5
+QT_INCLUDES:="-I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets"
 
 DEFAULT_PYTHON:=`py3versions -d`
 PYVERS:= `pyversions -s`
@@ -44,13 +45,13 @@ override_dh_auto_configure:
 		--with-Qt-bin=$(QT_BINDIR) --with-Qt-include-dir=/usr/include/$(QT) -with-Qt-lib=Qt5Widgets \
 		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " CXXFLAGS="$(CXXFLAGS) -fPIC " \
 		LIBS=" -lQt5Core " LDFLAGS="$(LDFLAGS)" \
-		CPPFLAGS=" -I/usr/include/$(QT) -I/usr/include/$(QT)/QtGui -I/usr/include/$(QT)/QtCore -I/usr/include/$(QT)/QtWidgets -I$(MPI_INC) $(CPPFLAGS)"  
+		CPPFLAGS=" $(QT_INCLUDES) -I$(MPI_INC) $(CPPFLAGS)"  
 
 # Iterate over some directories to avoid stepping into tools/silex, which doesn't build.
 override_dh_auto_build:
 	for d in src tools/browser tools/silock ; do \
 		$(MAKE) -C $$d CC=$(CC) CXX=$(CXX) ; done
-	set -e ; for p in $(PYVERS)  ; do   \
+	set -e ; for p in $(PYVERS) $(PY3VERS) ; do   \
 		$(MAKE) -C tools/python clean all check CC=$(CC) CXX=$(CXX) PYTHON=$$p; \
 		mkdir -p  debian/tmp/usr/lib/pyshared/$$p ;  \
 		cp tools/python/.libs/Silo.so debian/Silo.so.$$p  ; \
@@ -62,7 +63,6 @@ override_dh_auto_test:
                 $(MAKE) -C $$d check; done
 	
 override_dh_auto_install:
-	dh_auto_install
 	# move the python modules to where dh_pysupport will spot them ...
 	set -e; for p in $(PYVERS) $(PY3VERS); do \
 		mkdir -p debian/python-silo/usr/lib/$$p/site-packages ; \

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