Tree - rpms/wpa_supplicant - CentOS Git server

Blob History Raw

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