[silo-llnl] 06/08: Set QT_SELECT=5

[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 13400d82fc989c1c3dfbe72a1e85f371444db9e9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 21 19:22:47 2017 +0100

    Set QT_SELECT=5
---
 debian/rules | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index b9a4b58..c00d6d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,7 @@ endif
 export CONFIG_SHELL=/bin/sh
 
 # 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
+export QT_SELECT=5
 
 PYVERS:= `pyversions -s`
 PY3VERS:= `py3versions -s`
@@ -32,12 +31,10 @@ LIBDIR:=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 export DEFAULT_SZIP=/usr
 
-QT:=5
-QT_MOC:=moc
 QT_INC:=/usr/include/$(DEB_HOST_MULTIARCH)/qt5
 QT_BINDIR=/usr/bin
 QT_INCLUDES:=-I$(QT_INC) -I$(QT_INC)/QtGui -I$(QT_INC)/QtCore -I$(QT_INC)/QtWidgets
-QT_LIBS=-lQt5Core -lQt5Gui -lQt5Widgets
+QT_LIBS:=-lQt5Core -lQt5Gui -lQt5Widgets
 
 # Work with either old or new-style (co-installable)  HDF5 layouts
 ifneq ($(wildcard $(LIBDIR)/hdf5/$(MPI)/libhdf5.so),)

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