sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure.sh: Don't append the apps directory path setting if the correct setting is already in defined in the defconfig file.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5101 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-06 01:19:05 +00:00
parent d869cc4ef7
commit 3ad95c590b
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/src/lm3s/Kconfig
View File

@ -26,8 +26,8 @@ config ARCH_CHIP_LM3S8962
endchoice endchoice
choice choice
prompt "Toolchain" prompt "Toolchain"
default LM3S_BUILDROOT default LM3S_BUILDROOT
config LM3S_CODESOURCERYW config LM3S_CODESOURCERYW
bool "CodeSourcery GNU toolchain under Windows" bool "CodeSourcery GNU toolchain under Windows"

15
tools/configure.sh
View File

@ -123,8 +123,12 @@ fi
newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${configpath}/defconfig" | cut -d'=' -f2` newconfig=`grep CONFIG_NUTTX_NEWCONFIG= "${configpath}/defconfig" | cut -d'=' -f2`
defappdir=y
if [ -z "${appdir}" ]; then if [ -z "${appdir}" ]; then
appdir=`grep CONFIG_APPS_DIR= "${configpath}/defconfig" | cut -d'=' -f2` appdir=`grep CONFIG_APPS_DIR= "${configpath}/defconfig" | cut -d'=' -f2`
if [ ! -z "${appdir}" ]; then
defappdir=n
fi
fi fi
# Check for the apps/ directory in the usual place if appdir was not provided # 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" || \ install -C "${configpath}/appconfig" "${TOPDIR}/${appdir}/.config" || \
{ echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; } { echo "Failed to copy ${configpath}/appconfig" ; exit 10 ; }
echo "" >> "${TOPDIR}/.configX" if [ "X${defappdir}" = "Xy" ]; then
echo "# Application configuration" >> "${TOPDIR}/.configX" sed -i -e "/^CONFIG_APPS_DIR/d" "${TOPDIR}/.configX"
echo "" >> "${TOPDIR}/.configX" echo "" >> "${TOPDIR}/.configX"
echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.configX" echo "# Application configuration" >> "${TOPDIR}/.configX"
echo "" >> "${TOPDIR}/.configX"
echo "CONFIG_APPS_DIR=\"$appdir\"" >> "${TOPDIR}/.configX"
fi
fi fi
fi fi