From 3537ffab03983c7b84f3798de0009d54e27c45a3 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Sat, 30 Sep 2017 17:12:28 +1000 Subject: qt5: read deps from files in current directory fixes #1901 --- plugins/examples/qt5-freeze/qt5.mk | 10 +++++----- src/qt5.mk | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/examples/qt5-freeze/qt5.mk b/plugins/examples/qt5-freeze/qt5.mk index deef457..f26c7c2 100644 --- a/plugins/examples/qt5-freeze/qt5.mk +++ b/plugins/examples/qt5-freeze/qt5.mk @@ -1,10 +1,10 @@ # This file is part of MXE. See LICENSE.md for licensing information. PKG := qt5 -$(PKG)_WEBSITE := http://qt-project.org/ +$(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ - $(shell grep -l 'qtbase_VERSION' \ - $(TOP_DIR)/src/qt*.mk \ - --exclude '$(TOP_DIR)/src/qt5.mk')) +$(PKG)_DEPS := $(subst qt5, qtbase, \ + $(patsubst $(dir $(lastword $(MAKEFILE_LIST)))/%.mk,%,\ + $(shell grep -l 'qtbase_VERSION' \ + $(dir $(lastword $(MAKEFILE_LIST)))/qt*.mk))) diff --git a/src/qt5.mk b/src/qt5.mk index 3c7bf02..f26c7c2 100644 --- a/src/qt5.mk +++ b/src/qt5.mk @@ -4,7 +4,7 @@ PKG := qt5 $(PKG)_WEBSITE := https://www.qt.io/ $(PKG)_DESCR := Qt $(PKG)_VERSION = $(qtbase_VERSION) -$(PKG)_DEPS := $(patsubst $(TOP_DIR)/src/%.mk,%,\ - $(shell grep -l 'qtbase_VERSION' \ - $(TOP_DIR)/src/qt*.mk \ - --exclude '$(TOP_DIR)/src/qt5.mk')) +$(PKG)_DEPS := $(subst qt5, qtbase, \ + $(patsubst $(dir $(lastword $(MAKEFILE_LIST)))/%.mk,%,\ + $(shell grep -l 'qtbase_VERSION' \ + $(dir $(lastword $(MAKEFILE_LIST)))/qt*.mk))) -- cgit v0.12