40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 96e803dc2502f1d822258048bb8dd5febe733dc7 Mon Sep 17 00:00:00 2001
|
|
From: openEuler Buildteam <buildteam@openeuler.org>
|
|
Date: Fri, 10 Jan 2020 09:25:47 +0800
|
|
Subject: [PATCH] allow to override names of the Qt4 tools.
|
|
|
|
---
|
|
wpa_supplicant/Makefile | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
|
|
index 371789d..56c319c 100644
|
|
--- a/wpa_supplicant/Makefile
|
|
+++ b/wpa_supplicant/Makefile
|
|
@@ -21,7 +21,8 @@ export LIBDIR ?= /usr/local/lib/
|
|
export INCDIR ?= /usr/local/include/
|
|
export BINDIR ?= /usr/local/sbin/
|
|
PKG_CONFIG ?= pkg-config
|
|
-
|
|
+LRELEASE ?= lrelease
|
|
+QMAKE ?= qmake
|
|
CFLAGS += $(EXTRA_CFLAGS)
|
|
CFLAGS += -I$(abspath ../src)
|
|
CFLAGS += -I$(abspath ../src/utils)
|
|
@@ -1811,10 +1812,10 @@ wpa_gui:
|
|
@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
|
|
--
|
|
1.8.3.1
|
|
|