change default path for staging_dir.

http://www.openwrt.org/forum/viewtopic.php?p=5528#5528

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@421 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/Config.in b/openwrt/Config.in
index 5867be0..31ddbac 100644 (file)
--- a/openwrt/Config.in
+++ b/openwrt/Config.in
@@ -86,7 +86,7 @@ config BR2_TAR_VERBOSITY
 
 config BR2_STAGING_DIR
        string "Toolchain and header file location?"
 
 config BR2_STAGING_DIR
        string "Toolchain and header file location?"

-       default "$(BUILD_DIR)/staging_dir"
+       default "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)"

        help
            This is the location where the toolchain will be installed.
            Since the toolchain will not work if it is moved from this
        help
            This is the location where the toolchain will be installed.
            Since the toolchain will not work if it is moved from this


@@ -95,7 +95,7 @@ config BR2_STAGING_DIR
            the toolchain will be used.
 
            Most people will leave this set to the default value of
            the toolchain will be used.
 
            Most people will leave this set to the default value of

-           "$(BUILD_DIR)/staging_dir".
+           "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)".

 
 config BR2_JLEVEL
        int "Number of jobs to run simultaneously"
 
 config BR2_JLEVEL
        int "Number of jobs to run simultaneously"

diff --git a/openwrt/Makefile b/openwrt/Makefile
index ef60ff1..3d9bcb3 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/Makefile
@@ -116,7 +116,7 @@ dirclean: clean
        rm -rf $(BUILD_DIR)
 
 distclean: clean
        rm -rf $(BUILD_DIR)
 
 distclean: clean

-       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR)
+       rm -rf $(STAMP_DIR) $(DL_DIR) $(BUILD_DIR) $(TOOL_BUILD_DIR) $(STAGING_DIR)

        rm -f .config* .tmpconfig.h
 
 sourceball: distclean
        rm -f .config* .tmpconfig.h
 
 sourceball: distclean