X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Makefile;h=9bdb03a443ff857497c1961937b4812aa57d3890;hb=HEAD;hp=cbf9fa2cd1385e93d8e77cf961a69cfe9445b5be;hpb=a29d3bc48c40c6a2a93ae1806bea2ac26455cdbb;p=openwrt%2Fstaging%2Fjow.git

diff --git a/Makefile b/Makefile
index cbf9fa2cd1..9bdb03a443 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,10 @@ $(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 '/usr' -m 1)
-export PATH:=$(TOPDIR)/staging_dir/host/bin:$(PATH)
+DISTRO_PKG_CONFIG:=$(shell $(TOPDIR)/scripts/command_all.sh pkg-config | grep -e '/usr' -e '/nix/store' -m 1)
+
+export ORIG_PATH:=$(if $(ORIG_PATH),$(ORIG_PATH),$(PATH))
+export PATH:=$(if $(STAGING_DIR),$(abspath $(STAGING_DIR)/../host/bin),$(TOPDIR)/staging_dir/host/bin):$(PATH)
 
 ifneq ($(OPENWRT_BUILD),1)
   _SINGLE=export MAKEFLAGS=$(space);