fix gdb installation (patch from #809)

[openwrt.git] / rules.mk

diff --git a/rules.mk b/rules.mk
index 768b480..eebc758 100644 (file)
--- 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
 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
 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
 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
 
 # APPLICATIONS #
 HOSTCC:=gcc


@@ -105,7 +106,7 @@ IPKG:= \
 
 # invoke ipkg-build with some default options
 IPKG_BUILD:= \
 
 # 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:=
 
 ifeq ($(CONFIG_ENABLE_LOCALE),true)
   DISABLE_NLS:=