1.1 --- a/common/autoconf/source-dirs.m4 Thu Sep 06 17:27:20 2012 -0700
1.2 +++ b/common/autoconf/source-dirs.m4 Tue Sep 18 11:29:16 2012 -0700
1.3 @@ -250,31 +250,8 @@
1.4
1.5 AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS],
1.6 [
1.7 -LANGTOOLS_OUTPUTDIR="$OUTPUT_ROOT/langtools"
1.8 -CORBA_OUTPUTDIR="$OUTPUT_ROOT/corba"
1.9 -JAXP_OUTPUTDIR="$OUTPUT_ROOT/jaxp"
1.10 -JAXWS_OUTPUTDIR="$OUTPUT_ROOT/jaxws"
1.11 -HOTSPOT_OUTPUTDIR="$OUTPUT_ROOT/hotspot"
1.12 +BUILD_OUTPUT="$OUTPUT_ROOT"
1.13 +AC_SUBST(BUILD_OUTPUT)
1.14 +
1.15 JDK_OUTPUTDIR="$OUTPUT_ROOT/jdk"
1.16 -IMAGES_OUTPUTDIR="$OUTPUT_ROOT/images"
1.17 -
1.18 -AC_SUBST(LANGTOOLS_OUTPUTDIR)
1.19 -AC_SUBST(CORBA_OUTPUTDIR)
1.20 -AC_SUBST(JAXP_OUTPUTDIR)
1.21 -AC_SUBST(JAXWS_OUTPUTDIR)
1.22 -AC_SUBST(HOTSPOT_OUTPUTDIR)
1.23 -AC_SUBST(JDK_OUTPUTDIR)
1.24 -AC_SUBST(IMAGES_OUTPUTDIR)
1.25 -
1.26 -LANGTOOLS_DIST="$OUTPUT_ROOT/langtools/dist"
1.27 -CORBA_DIST="$OUTPUT_ROOT/corba/dist"
1.28 -JAXP_DIST="$OUTPUT_ROOT/jaxp/dist"
1.29 -JAXWS_DIST="$OUTPUT_ROOT/jaxws/dist"
1.30 -HOTSPOT_DIST="$OUTPUT_ROOT/hotspot/dist"
1.31 -
1.32 -AC_SUBST(LANGTOOLS_DIST)
1.33 -AC_SUBST(CORBA_DIST)
1.34 -AC_SUBST(JAXP_DIST)
1.35 -AC_SUBST(JAXWS_DIST)
1.36 -AC_SUBST(HOTSPOT_DIST)
1.37 ])
