X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=rules.mk;h=e13d8ccc9fc5df35edec772a98897081f25bb17c;hp=e5f681aeb22a3f9f7ac2efae16c9d16a9505192f;hb=de3b9ad431021ce3fe81484532ad90d59782a282;hpb=550803c28067d30c6582c9660e44e3b1ce85835a

diff --git a/rules.mk b/rules.mk
index e5f681aeb2..e13d8ccc9f 100644
--- a/rules.mk
+++ b/rules.mk
@@ -30,6 +30,11 @@ define sep
 
 endef
 
+define newline
+
+
+endef
+
 _SINGLE=export MAKEFLAGS=$(space);
 CFLAGS:=
 ARCH:=$(subst i486,i386,$(subst i586,i386,$(subst i686,i386,$(call qstrip,$(CONFIG_ARCH)))))
@@ -111,7 +116,7 @@ STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
 BUILD_LOG_DIR:=$(TOPDIR)/logs
 PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
 
-TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
+TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) $(EXTRA_OPTIMIZATION)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)
 TARGET_ASFLAGS_DEFAULT = $(TARGET_CFLAGS)
@@ -202,6 +207,8 @@ else
   TARGET_NM:=$(TARGET_CROSS)nm
 endif
 
+BUILD_KEY=$(TOPDIR)/key-build
+
 TARGET_CC:=$(TARGET_CROSS)gcc
 TARGET_CXX:=$(TARGET_CROSS)g++
 KPATCH:=$(SCRIPT_DIR)/patch-kernel.sh
@@ -210,11 +217,11 @@ CP:=cp -fpR
 LN:=ln -sf
 XARGS:=xargs -r
 
-BASH:=$(STAGING_DIR_HOST)/bin/bash
-TAR:=$(STAGING_DIR_HOST)/bin/tar
-FIND:=$(STAGING_DIR_HOST)/bin/find
-PATCH:=$(STAGING_DIR_HOST)/bin/patch
-PYTHON:=$(STAGING_DIR_HOST)/bin/python
+BASH:=bash
+TAR:=tar
+FIND:=find
+PATCH:=patch
+PYTHON:=python
 
 INSTALL_BIN:=install -m0755
 INSTALL_DIR:=install -d -m0755
@@ -269,6 +276,7 @@ else
     NM="$(TARGET_CROSS)nm" \
     STRIP="$(STRIP)" \
     STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \
+    PATCHELF="$(STAGING_DIR_HOST)/bin/patchelf" \
     $(SCRIPT_DIR)/rstrip.sh
 endif