equal
deleted
inserted
replaced
881 else |
881 else |
882 AC_MSG_RESULT([in build directory with custom name]) |
882 AC_MSG_RESULT([in build directory with custom name]) |
883 fi |
883 fi |
884 |
884 |
885 if test "x$CUSTOM_ROOT" != x; then |
885 if test "x$CUSTOM_ROOT" != x; then |
886 OUTPUTDIR="${CUSTOM_ROOT}/build/${CONF_NAME}" |
886 WORKSPACE_ROOT="${CUSTOM_ROOT}" |
887 else |
887 else |
888 OUTPUTDIR="${TOPDIR}/build/${CONF_NAME}" |
888 WORKSPACE_ROOT="${TOPDIR}" |
889 fi |
889 fi |
|
890 OUTPUTDIR="${WORKSPACE_ROOT}/build/${CONF_NAME}" |
890 $MKDIR -p "$OUTPUTDIR" |
891 $MKDIR -p "$OUTPUTDIR" |
891 if test ! -d "$OUTPUTDIR"; then |
892 if test ! -d "$OUTPUTDIR"; then |
892 AC_MSG_ERROR([Could not create build directory $OUTPUTDIR]) |
893 AC_MSG_ERROR([Could not create build directory $OUTPUTDIR]) |
893 fi |
894 fi |
894 else |
895 else |
940 |
941 |
941 SPEC="$OUTPUTDIR/spec.gmk" |
942 SPEC="$OUTPUTDIR/spec.gmk" |
942 AC_SUBST(SPEC) |
943 AC_SUBST(SPEC) |
943 AC_SUBST(CONF_NAME) |
944 AC_SUBST(CONF_NAME) |
944 AC_SUBST(OUTPUTDIR) |
945 AC_SUBST(OUTPUTDIR) |
|
946 AC_SUBST(WORKSPACE_ROOT) |
945 AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) |
947 AC_SUBST(CONFIGURESUPPORT_OUTPUTDIR) |
946 |
948 |
947 # The spec.gmk file contains all variables for the make system. |
949 # The spec.gmk file contains all variables for the make system. |
948 AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) |
950 AC_CONFIG_FILES([$OUTPUTDIR/spec.gmk:$AUTOCONF_DIR/spec.gmk.in]) |
949 # The bootcycle-spec.gmk file contains support for boot cycle builds. |
951 # The bootcycle-spec.gmk file contains support for boot cycle builds. |