tools/patchelf: update to 0.18.0

[openwrt/staging/dedeckeh.git] / Makefile

diff --git a/Makefile b/Makefile
index bfb52c5ddd63ee2c38d4639c5fd7226e9103667f..cff0e1d8d482993620ba967df924f19f19027152 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt dir
 
 world:
 
-DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep -E '\/usr' -m 1)
-export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH)
+DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep '/usr' -m 1)
+export PATH:=$(if $(STAGING_DIR),$(abspath $(STAGING_DIR)/../host/bin),$(TOPDIR)/staging_dir/host/bin):$(PATH)
 
 ifneq ($(OPENWRT_BUILD),1)
   _SINGLE=export MAKEFLAGS=$(space);