From ed4164125f5f3439bf49dd65a626bb1e9d57632a Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679>
Date: Thu, 6 Sep 2012 01:19:05 +0000
Subject: [PATCH] configure.sh:  Don't append the apps directory path setting
 if the correct setting is already in defined in the defconfig file.

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5101 7fd9a85b-ad96-42d3-883c-3090e2eb8679
---
 nuttx/arch/arm/src/lm3s/Kconfig |  4 ++--
 nuttx/tools/configure.sh        | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/nuttx/arch/arm/src/lm3s/Kconfig b/nuttx/arch/arm/src/lm3s/Kconfig
index a1b401db7..1fd203f4f 100644
--- a/nuttx/arch/arm/src/lm3s/Kconfig
+++ b/nuttx/arch/arm/src/lm3s/Kconfig
@@ -26,8 +26,8 @@ config ARCH_CHIP_LM3S8962
 endchoice
 
 choice
-        prompt "Toolchain"
-        default LM3S_BUILDROOT
+	prompt "Toolchain"
+	default LM3S_BUILDROOT
 
 config LM3S_CODESOURCERYW
 	bool "CodeSourcery GNU toolchain under Windows"
diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh
index c0df7035f..7ac4b8a3c 100755
--- a/nuttx/tools/configure.sh
+++ b/nuttx/tools/configure.sh
@@ -123,8 +123,12 @@ fi
 
 newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${configpath}/defconfig" | cut -d'=' -f2`
 
+defappdir=y
 if [ -z "${appdir}" ]; then
   appdir=`grep CONFIG_APPS_DIR= "${configpath}/defconfig" | cut -d'=' -f2`
+  if [ ! -z "${appdir}" ]; then
+    defappdir=n
+  fi
 fi
 
 # Check for the apps/ directory in the usual place if appdir was not provided
@@ -181,10 +185,13 @@ if [ ! -z "${appdir}" -a "X${newconfig}" != "Xy" ]; then
     install -C "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \
       { echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; }
 
-    echo "" >> "${TOPDIR}/.configX"
-    echo "# Application configuration" >> "${TOPDIR}/.configX"
-    echo "" >> "${TOPDIR}/.configX"
-    echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.configX"
+    if [ "X${defappdir}" = "Xy" ]; then
+      sed -i -e "/^CONFIG_APPS_DIR/d" "${TOPDIR}/.configX"
+      echo "" >> "${TOPDIR}/.configX"
+      echo "# Application configuration" >> "${TOPDIR}/.configX"
+      echo "" >> "${TOPDIR}/.configX"
+      echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.configX"
+    fi 
   fi
 fi