[X2Go-Commits] [x2goclient] 02/02: Look for qmake-qt4, if not in PATH, then set QMAKE and LRELEASE to qt without suffix
git-admin at x2go.org
git-admin at x2go.org
Wed May 20 17:09:43 CEST 2020
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/focal-ppa
in repository x2goclient.
commit 7c3c5a0773cf022ba9c52df2adc620b79ad6f789
Author: Juri Grabowski <git-commit at jugra.de>
Date: Wed May 20 15:07:25 2020 +0000
Look for qmake-qt4, if not in PATH, then set QMAKE and LRELEASE to qt without suffix
It should save capability to build new releases on old Platforms with qt4.
---
Makefile | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 15ddac1..2b8276f 100755
--- a/Makefile
+++ b/Makefile
@@ -20,8 +20,13 @@ ETCDIR=/etc/x2go
BINDIR=$(PREFIX)/bin
SHAREDIR=$(PREFIX)/share
MANDIR=$(SHAREDIR)/man
-QMAKE_BINARY=qmake-qt4
-LRELEASE_BINARY=lrelease-qt4
+ifeq ($(shell type -a qmake-qt4 ; echo $? ),0)
+ QMAKE_BINARY=qmake-qt4
+ LRELEASE_BINARY=lrelease-qt4
+else
+ QMAKE_BINARY=qmake
+ LRELEASE_BINARY=lrelease
+endif
QMAKE_OPTS=
LDFLAGS=
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
More information about the x2go-commits
mailing list