Changes to get a clean compile with the Kconfig Shenzhou board. Still some link issues

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5115 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 14 insertions, 9 deletions

diff --git a/nuttx/tools/configure.sh b/nuttx/tools/configure.sh
index 7ac4b8a3c..3b68fe3f6 100755
--- a/nuttx/tools/configure.sh
+++ b/nuttx/tools/configure.sh
@@ -125,8 +125,9 @@ newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${configpath}/defconfig" | cut -d'=' -f
 
 defappdir=y
 if [ -z "${appdir}" ]; then
-  appdir=`grep CONFIG_APPS_DIR= "${configpath}/defconfig" | cut -d'=' -f2`
+  quoted=`grep "^CONFIG_APPS_DIR=" "${configpath}/defconfig" | cut -d'=' -f2`
   if [ ! -z "${appdir}" ]; then
+    appdir=`echo ${quoted} | sed -e "s/\"//g"`
     defappdir=n
   fi
 fi
@@ -174,6 +175,18 @@ chmod 755 "${TOPDIR}/setenv.sh"
 install -C "${configpath}/defconfig" "${TOPDIR}/.configX" || \
   { echo "Failed to copy ${configpath}/defconfig" ; exit 9 ; }
 
+# If we did not use the CONFIG_APPS_DIR that was in the defconfig config file,
+# then append the correct application information to the tail of the .config
+# file
+
+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 
+
 # Copy appconfig file.  The appconfig file will be copied to ${appdir}/.config
 # if both (1) ${appdir} is defined and (2) we are not using the new configuration
 # (which does not require a .config file in the appsdir.
@@ -184,14 +197,6 @@ if [ ! -z "${appdir}" -a "X${newconfig}" != "Xy" ]; then
   else
     install -C "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \
       { echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; }
-
-    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