919688
From 9404f356e394604d1d3d6dbffc52abd54260e4d4 Mon Sep 17 00:00:00 2001
919688
From: Lubomir Rintel <lkundrak@v3.sk>
919688
Date: Tue, 27 Oct 2015 08:56:35 +0100
919688
Subject: [PATCH] wpa_supplicant: allow overriding the names of the Qt4 tools
919688
919688
This is useful for distributions that ship different versions of Qt in
919688
different locations.
919688
---
919688
 wpa_supplicant/Makefile | 7 +++++--
919688
 1 file changed, 5 insertions(+), 2 deletions(-)
919688
919688
--- a/wpa_supplicant/Makefile
919688
+++ b/wpa_supplicant/Makefile
abfddd
@@ -35,6 +35,9 @@ export INCDIR ?= /usr/local/include
abfddd
 export BINDIR ?= /usr/local/sbin
919688
 PKG_CONFIG ?= pkg-config
919688
 
919688
+QMAKE ?= qmake
919688
+LRELEASE ?= lrelease
919688
+
919688
 CFLAGS += $(EXTRA_CFLAGS)
919688
 CFLAGS += -I$(abspath ../src)
919688
 CFLAGS += -I$(abspath ../src/utils)
abfddd
@@ -2039,10 +2042,10 @@ wpa_gui:
919688
 	@echo "wpa_gui has been removed - see wpa_gui-qt4 for replacement"
919688
 
919688
 wpa_gui-qt4/Makefile:
919688
-	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
919688
+	$(QMAKE) -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
919688
 
919688
 wpa_gui-qt4/lang/wpa_gui_de.qm: wpa_gui-qt4/lang/wpa_gui_de.ts
919688
-	lrelease wpa_gui-qt4/wpa_gui.pro
919688
+	$(LRELEASE) wpa_gui-qt4/wpa_gui.pro
919688
 
919688
 wpa_gui-qt4: wpa_gui-qt4/Makefile wpa_gui-qt4/lang/wpa_gui_de.qm
919688
 	$(MAKE) -C wpa_gui-qt4