don't mess with the staging dir too much when building the sdk

[openwrt/openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index d52539f3f2b80b0d6a5fd1521a31685720570104..3afdab67c2822c4a3a2925c326ef580363dd7486 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -42,7 +42,7 @@ endif
 
 IMAGE:=$(BUILD_DIR)/root_fs_$(ARCH)
 
 
 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)
 TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 
 export PATH:=$(TARGET_PATH)


@@ -58,6 +58,11 @@ PATCH:=$(SCRIPT_DIR)/patch-kernel.sh
 SED:=$(STAGING_DIR)/bin/sed -i -e
 CP:=cp -fpR
 
 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
 ifneq ($(CONFIG_CCACHE),)
   # FIXME: move this variable to a better location
   export CCACHE_DIR=$(STAGING_DIR)/ccache


@@ -73,7 +78,8 @@ TARGET_CONFIGURE_OPTS:= \
   GCC="$(TARGET_CC)" \
   CXX=$(TARGET_CROSS)g++ \
   RANLIB=$(TARGET_CROSS)ranlib \
   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:= \
 
 # strip an entire directory
 RSTRIP:= \