- From 0847b53fb45e998718c25f847e47a3c594665a53 Mon Sep 17 00:00:00 2001

- From: Raul Metsma <raul@metsma.ee>

- Date: Tue, 13 Mar 2018 08:42:22 +0200

- Subject: [PATCH] Add LIBPATH qmake/make variable and select default qt5

- 

- Signed-off-by: Raul Metsma <raul@metsma.ee>

- ---

-  host-linux/GNUmakefile              | 7 ++++---

-  host-linux/chrome-token-signing.pro | 3 ++-

-  2 files changed, 6 insertions(+), 4 deletions(-)

- 

- diff --git a/host-linux/GNUmakefile b/host-linux/GNUmakefile

- index 1274617..fbe1a4c 100644

- --- a/host-linux/GNUmakefile

- +++ b/host-linux/GNUmakefile

- @@ -16,10 +16,11 @@

-  # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

-  #

-  

- -ifeq ($(BUILD_NUMBER),)

- -BUILD_NUMBER = 0

- -endif

- +BUILD_NUMBER ?= 0

-  include ../VERSION.mk

- +LIBPATH ?= /usr/lib

- +# man qtchooser

- +export QT_SELECT=qt5

-  

-  all:

-  	qmake VERSION=$(VERSIONEX)

- diff --git a/host-linux/chrome-token-signing.pro b/host-linux/chrome-token-signing.pro

- index 60e8e36..39d763f 100644

- --- a/host-linux/chrome-token-signing.pro

- +++ b/host-linux/chrome-token-signing.pro

- @@ -15,11 +15,12 @@ SOURCES += \

-      chrome-host.cpp

-  HEADERS += *.h ../host-shared/*.h

-  RESOURCES += chrome-token-signing.qrc

- +isEmpty(LIBPATH):LIBPATH=/usr/lib

-  target.path = /usr/bin

-  hostconf.path = /etc/opt/chrome/native-messaging-hosts

-  hostconf.files += ee.ria.esteid.json

-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1318461

- -ffconf.path = /usr/lib/mozilla/native-messaging-hosts

- +ffconf.path = $${LIBPATH}/mozilla/native-messaging-hosts

-  ffconf.files += ff/ee.ria.esteid.json

-  extension.path = /opt/google/chrome/extensions

-  extension.files += ../ckjefchnfjhjfedoccjbhjpbncimppeg.json

- SHA512 (chrome-token-signing-1.0.6.tar.gz) = 81591fab0bcfcff75af332519e17bc2be91d393e7ce24dd886e5baf8e72214e3d8198954174316071fbf489f09aefcc397355557abd019717deb61aed86609d5