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