X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=rules.mk;h=3afdab67c2822c4a3a2925c326ef580363dd7486;hb=591810182c58e5ebf2bd30b8a9796ef9ed3860c2;hp=be269e77f33c9b308bc5bd01c255411e99ab21d0;hpb=f52d66ff00b24111f87c274d3d7085ef2e1d27b1;p=openwrt.git

diff --git a/rules.mk b/rules.mk
index be269e77f3..3afdab67c2 100644
--- a/rules.mk
+++ b/rules.mk
@@ -9,7 +9,6 @@
 include $(TOPDIR)/include/verbose.mk
 
 export SHELL=/usr/bin/env bash -c '. $(TOPDIR)/include/shell.sh; eval "$$2"' --
-export BASH=$(shell which bash)
 
 ARCH:=$(strip $(subst ",, $(CONFIG_ARCH)))
 TARGET_OPTIMIZATION:=$(strip $(subst ",, $(CONFIG_TARGET_OPTIMIZATION)))
@@ -30,7 +29,7 @@ BIN_DIR:=$(TOPDIR)/bin
 PACKAGE_DIR:=$(BIN_DIR)/packages
 IPKG_TARGET_DIR:=$(PACKAGE_DIR)
 BUILD_DIR:=$(TOPDIR)/build_$(ARCH)
-TMP_DIR:=$(BUILD_DIR)/tmp
+TMP_DIR:=$(TOPDIR)/tmp
 STAMP_DIR:=$(BUILD_DIR)/stamp
 TARGET_DIR:=$(BUILD_DIR)/root
 IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/ipkg
@@ -43,7 +42,7 @@ endif
 
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 
-TARGET_PATH:=$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
+TARGET_PATH:=$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/usr/bin:$(STAGING_DIR)/bin:$(PATH)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
 export PATH:=$(TARGET_PATH)
@@ -59,6 +58,11 @@ PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 
+INSTALL_BIN:=install -m0755
+INSTALL_DIR:=install -d -m0755
+INSTALL_DATA:=install -m0644
+INSTALL_CONF:=install -m0600
+
 ifneq ($(CONFIG_CCACHE),)
   # FIXME: move this variable to a better location
   export CCACHE_DIR=$(STAGING_DIR)/ccache
@@ -74,7 +78,8 @@ TARGET_CONFIGURE_OPTS:= \
   GCC="$(TARGET_CC)" \
   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \
-  STRIP=$(TARGET_CROSS)strip
+  STRIP=$(TARGET_CROSS)strip \
+  OBJCOPY=$(TARGET_CROSS)objcopy
 
 # strip an entire directory
 RSTRIP:= \
@@ -106,11 +111,21 @@ ifneq ($(CONFIG_LARGEFILE),y)
 endif
 
 ifeq ($(CONFIG_TAR_VERBOSITY),y)
-  TAR_OPTIONS=-xvf
+  TAR_OPTIONS:=-xvf -
 else
-  TAR_OPTIONS=-xf
+  TAR_OPTIONS:=-xf -
 endif
 
+define shvar
+V_$(subst .,_,$(subst -,_,$(subst /,_,$(1))))
+endef
+
+define shexport
+$(call shvar,$(1))=$$(call $(1))
+export $(call shvar,$(1))
+endef
+
+
 all:
 FORCE: ;
 .PHONY: FORCE