--- a/make/autoconf/source-dirs.m4	Mon Sep 25 10:21:23 2017 +0200
+++ b/make/autoconf/source-dirs.m4	Mon Sep 25 10:32:00 2017 +0200
@@ -25,9 +25,9 @@
 
 AC_DEFUN_ONCE([SRCDIRS_SETUP_DIRS],
 [
-  BUILD_OUTPUT="$OUTPUT_ROOT"
-  AC_SUBST(BUILD_OUTPUT)
-  JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
+  OUTPUTDIR="$OUTPUTDIR"
+  AC_SUBST(OUTPUTDIR)
+  JDK_OUTPUTDIR="$OUTPUTDIR/jdk"
 
   # Where are the sources.
   AC_SUBST(TOPDIR)