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