[BACK]Return to build.sh CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/build.sh between version 1.214 and 1.215

version 1.214, 2009/10/03 19:19:59 version 1.215, 2009/10/14 19:03:12
Line 1144  validatemakeparams()
Line 1144  validatemakeparams()
                 ${runcmd} cd "${TOP}"                  ${runcmd} cd "${TOP}"
         fi          fi
   
         # Find TOOLDIR, DESTDIR, RELEASEDIR, and RELEASEMACHINEDIR.          # Find TOOLDIR, DESTDIR, and RELEASEDIR, according to getmakevar,
           # and bomb if they have changed from the values we had from the
           # command line or environment.
           #
         # This must be done after creating the top-level object directory.          # This must be done after creating the top-level object directory.
         #          #
         TOOLDIR=$(getmakevar TOOLDIR)          for var in TOOLDIR DESTDIR RELEASEDIR
         statusmsg "TOOLDIR path:     ${TOOLDIR}"          do
         DESTDIR=$(getmakevar DESTDIR)                  eval oldval=\"\$${var}\"
         RELEASEDIR=$(getmakevar RELEASEDIR)                  newval="$(getmakevar $var)"
                   if ! $do_expertmode; then
                           : ${__SRC_TOP_OBJ__:=$(getmakevar __SRC_TOP_OBJ__)}
                           case "$var" in
                           DESTDIR)
                                   : ${newval:=${_SRC_TOP_OBJ_}/destdir.${MACHINE}}
                                   ;;
                           RELEASEDIR)
                                   : ${newval:=${_SRC_TOP_OBJ_}/releasedir}
                                   ;;
                           esac
                   fi
                   if [ -n "$oldval" ] && [ "$oldval" != "$newval" ]; then
                           bomb "Value of ${var} has changed" \
                                   "(was \"${oldval}\", now \"${newval}\")"
                   fi
                   eval ${var}=\"\${newval}\"
                   eval export ${var}
                   statusmsg "${var} path:     ${newval}"
           done
   
           # RELEASEMACHINEDIR is just a subdir name, e.g. "i386".
         RELEASEMACHINEDIR=$(getmakevar RELEASEMACHINEDIR)          RELEASEMACHINEDIR=$(getmakevar RELEASEMACHINEDIR)
         if ! $do_expertmode; then  
                 _SRC_TOP_OBJ_=$(getmakevar _SRC_TOP_OBJ_)  
                 : ${DESTDIR:=${_SRC_TOP_OBJ_}/destdir.${MACHINE}}  
                 : ${RELEASEDIR:=${_SRC_TOP_OBJ_}/releasedir}  
                 makeenv="${makeenv} DESTDIR RELEASEDIR"  
         fi  
         export TOOLDIR DESTDIR RELEASEDIR  
         statusmsg "DESTDIR path:     ${DESTDIR}"  
         statusmsg "RELEASEDIR path:  ${RELEASEDIR}"  
   
         # Check validity of TOOLDIR and DESTDIR.          # Check validity of TOOLDIR and DESTDIR.
         #          #
Legend:
Removed from v.1.214  
changed lines
  Added in v.1.215
CVSweb <webmaster@jp.NetBSD.org>