X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=Makefile;h=cff0e1d8d482993620ba967df924f19f19027152;hb=635d177ac95e0ba21fc0b4f26dcc9c7bcd516cca;hp=3ac110367df48105695af2ff80341ba5f7c74e85;hpb=aeaa816cd2bd22de165c71a41d8d198a9235e971;p=openwrt%2Fstaging%2Fnoltari.git diff --git a/Makefile b/Makefile index 3ac110367d..cff0e1d8d4 100644 --- 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' | head -n 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);