wpa_supplicant/wpa_supplicant-gui-qt4.patch

37 lines
1.2 KiB
Diff
Raw Normal View History

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