diff --git a/configure.ac b/configure.ac index 43f023a..9432a7a 100644 --- a/configure.ac +++ b/configure.ac @@ -22,6 +22,10 @@ AC_CONFIG_FILES(makefile src/makefile debian/changelog debian/control) AC_PROG_CXX AC_PROG_CC +AC_CHECK_PROG(QMAKE, qmake-qt5) +AC_CHECK_PROG(QMAKE, qtchooser, [qtchooser -run-tool=qmake -qt=qt5]) +AC_CHECK_PROG(QMAKE, qmake) + README=$(tail -n +3 README) README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') DESCRIPTION=$(head -1 README) diff --git a/debian/control.in b/debian/control.in index 9c04d04..652ac60 100644 --- a/debian/control.in +++ b/debian/control.in @@ -2,7 +2,7 @@ Source: @PACKAGE_NAME@ Section: devel Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper (>= 8.0.0), libtool, svn2cl, autotools-dev, lsb-release, mrw-c++-dev, libxml-cxx-dev, qt5-qmake +Build-Depends: debhelper (>= 8.0.0), pkg-config, libtool, svn2cl, autotools-dev, doxygen, graphviz, lsb-release, mrw-c++-dev, libxml-cxx-dev, qt5-qmake, libqt5webkit5-dev, qtchooser | qt5-default Standards-Version: 3.9.2 Homepage: https://dev.marc.waeckerlin.org/redmine/@PACKAGE_NAME@ diff --git a/src/makefile.am b/src/makefile.am index 72a6bb6..7878f45 100644 --- a/src/makefile.am +++ b/src/makefile.am @@ -15,7 +15,7 @@ webrunner: make.webrunner webtester: make.webtester makefile.%: ${srcdir}/webtester.pro - qmake -makefile -o $@ -config debug -config ${@:makefile.%=%} $< + ${QMAKE} -makefile -o $@ -config debug -config ${@:makefile.%=%} $< make.%: makefile.% make -f ${<}