More version-related fixes

git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3504 7fd9a85b-ad96-42d3-883c-3090e2eb8679

nuttx/Makefile

@@ -258,6 +258,7 @@ $(TOPDIR)/.version:
 	@if [ ! -f .version ]; then \
 		echo "No .version file found, creating one"; \
 		tools/version.sh -v 0.0 -b 0 .version; \
+		chmod 755 .version; \
 	fi
 
 # Create the include/nuttx/version.h file

nuttx/tools/configure.sh

@@ -121,7 +121,7 @@ if [ -z "${appdir}" ]; then
 
   # Check for a version file
 
-  unset CONFIG_NUTTX_VERSION
+  unset CONFIG_VERSION_STRING
   if [ -x "${TOPDIR}/.version" ]; then
     source "${TOPDIR}/.version"
   fi
@@ -134,8 +134,8 @@ if [ -z "${appdir}" ]; then
   else
     # Check for a versioned apps/ directory
 
-    if [ -d "${TOPDIR}/../apps-${CONFIG_NUTTX_VERSION}" ]; then
-      appdir="../apps-${CONFIG_NUTTX_VERSION}"
+    if [ -d "${TOPDIR}/../apps-${CONFIG_VERSION_STRING}" ]; then
+      appdir="../apps-${CONFIG_VERSION_STRING}"
     fi 
   fi
 fi

nuttx/tools/zipme.sh

@@ -124,6 +124,7 @@ if [ ! -x "${VERSIONSH}" ]; then
 fi
 ${VERSIONSH} -v ${VERSION} ${NUTTX}/.version || \
 	{ echo "${VERSIONSH} failed"; cat ${NUTTX}/.version; exit 1; }
+chmod 755 ${NUTTX}/.version
 
 # Perform a full clean for the distribution