--- old/make/autoconf/basics.m4	2019-04-10 18:47:53.518427800 -0400
+++ new/make/autoconf/basics.m4	2019-04-10 18:47:52.579333900 -0400
@@ -883,11 +883,10 @@
     fi
 
     if test "x$CUSTOM_ROOT" != x; then
-      WORKSPACE_ROOT="${CUSTOM_ROOT}"
+      OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}"
     else
-      WORKSPACE_ROOT="${TOPDIR}"
+      OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}"
     fi
-    OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}"
     $MKDIR -p "$OUTPUTDIR"
     if test ! -d "$OUTPUTDIR"; then
       AC_MSG_ERROR([Could not create build directory $OUTPUTDIR])
@@ -943,7 +942,6 @@
   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.