make/autoconf/basics.m4

*** 879,892 ****
      else
        AC_MSG_RESULT([in build directory with custom name])
      fi
  
      if test "x$CUSTOM_ROOT" != x; then
!       OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}"
      else
!       OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}"
      fi
      $MKDIR -p "$OUTPUTDIR"
      if test ! -d "$OUTPUTDIR"; then
        AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
      fi
    else
--- 879,893 ----
      else
        AC_MSG_RESULT([in build directory with custom name])
      fi
  
      if test "x$CUSTOM_ROOT" != x; then
!       WORKSPACE_ROOT="${CUSTOM_ROOT}"
      else
!       WORKSPACE_ROOT="${TOPDIR}"
      fi
+     OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}"
      $MKDIR -p "$OUTPUTDIR"
      if test ! -d "$OUTPUTDIR"; then
        AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
      fi
    else
*** 938,947 ****
--- 939,949 ----
  
    SPEC="$OUTPUTDIR/spec.gmk"
    AC_SUBST(SPEC)
    AC_SUBST(CONF_NAME)
    AC_SUBST(OUTPUTDIR)
+   AC_SUBST(WORKSPACE_ROOT)
    AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR)
  
    # The spec.gmk file contains all variables for the make system.
    AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
    # The bootcycle-spec.gmk file contains support for boot cycle builds.