X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=rules.mk;h=eebc758224c6d811f761cbf6fb6470e05623fb0a;hb=b0ccd00793948e0fe2456f25ff6ad0e99c2eaa9a;hp=768b4805595624487068621601ea7f56886c70a6;hpb=f4e092f9df4fde40d424747f4c509f67cb50a03f;p=openwrt-10.03%2F.git

diff --git a/rules.mk b/rules.mk
index 768b48055..eebc75822 100644
--- a/rules.mk
+++ b/rules.mk
@@ -22,7 +22,8 @@ OPTIMIZE_FOR_CPU:=$(ARCH)
 DL_DIR:=$(TOPDIR)/dl
 INCLUDE_DIR:=$(TOPDIR)/include
 SCRIPT_DIR:=$(TOPDIR)/scripts
-TOOL_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
+TOOL_BUILD_DIR:=$(TOPDIR)/tool_build
+TOOLCHAIN_BUILD_DIR:=$(TOPDIR)/toolchain_build_$(ARCH)
 STAGING_DIR:=$(TOPDIR)/staging_dir_$(ARCH)
 BIN_DIR:=$(TOPDIR)/bin
 PACKAGE_DIR:=$(BIN_DIR)/packages
@@ -47,7 +48,7 @@ TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)
 export PATH:=$(TARGET_PATH)
 
 LINUX_DIR:=$(BUILD_DIR)/linux
-LINUX_HEADERS_DIR:=$(TOOL_BUILD_DIR)/linux
+LINUX_HEADERS_DIR:=$(TOOLCHAIN_BUILD_DIR)/linux
 
 # APPLICATIONS #
 HOSTCC:=gcc
@@ -105,7 +106,7 @@ IPKG:= \
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
-  ipkg-build -c -o root -g root
+  ipkg-build -c -o 0 -g 0
 
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=