equal
deleted
inserted
replaced
656 else |
656 else |
657 AC_MSG_RESULT([in build directory with custom name]) |
657 AC_MSG_RESULT([in build directory with custom name]) |
658 fi |
658 fi |
659 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" |
659 OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}" |
660 $MKDIR -p "$OUTPUT_ROOT" |
660 $MKDIR -p "$OUTPUT_ROOT" |
|
661 CONFIGURESUPPORT_OUTPUTDIR="$OUTPUT_ROOT/configure-support" |
|
662 $MKDIR -p "$CONFIGURESUPPORT_OUTPUTDIR" |
661 if test ! -d "$OUTPUT_ROOT"; then |
663 if test ! -d "$OUTPUT_ROOT"; then |
662 AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) |
664 AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT]) |
663 fi |
665 fi |
664 else |
666 else |
665 # We are running configure from outside of the src dir. |
667 # We are running configure from outside of the src dir. |
701 BASIC_FIXUP_PATH(OUTPUT_ROOT) |
703 BASIC_FIXUP_PATH(OUTPUT_ROOT) |
702 |
704 |
703 AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) |
705 AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk) |
704 AC_SUBST(CONF_NAME, $CONF_NAME) |
706 AC_SUBST(CONF_NAME, $CONF_NAME) |
705 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) |
707 AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT) |
|
708 AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) |
706 |
709 |
707 # The spec.gmk file contains all variables for the make system. |
710 # The spec.gmk file contains all variables for the make system. |
708 AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) |
711 AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) |
709 # The hotspot-spec.gmk file contains legacy variables for the hotspot make system. |
712 # The hotspot-spec.gmk file contains legacy variables for the hotspot make system. |
710 AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) |
713 AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in]) |