diff -r bd443070a313 Makefile.am --- a/Makefile.am Mon Jul 19 14:39:53 2010 +0200 +++ b/Makefile.am Tue Jul 20 16:47:23 2010 +0200 @@ -27,7 +27,7 @@ # Build directories -BUILD_DIR = openjdk.build +BUILD_DIR = @OPENJDK_BUILD_DIR@ BUILD_OUTPUT_DIR = $(abs_top_builddir)/$(BUILD_DIR) DEBUG_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-debug ECJ_BUILD_OUTPUT_DIR = $(BUILD_OUTPUT_DIR)-ecj diff -r bd443070a313 configure.ac --- a/configure.ac Mon Jul 19 14:39:53 2010 +0200 +++ b/configure.ac Tue Jul 20 16:47:23 2010 +0200 @@ -140,6 +140,8 @@ IT_SET_ARCH_SETTINGS SET_OS_DIRS +OPENJDK_BUILD_DIR=openjdk.build +AC_SUBST(OPENJDK_BUILD_DIR) if test "${with_openjdk}" = true then @@ -311,10 +313,10 @@ [AS_HELP_STRING([--with-abs-install-dir], [The absolute path where the j2sdk-image dir will be installed])], [if test "x${withval}" = x; then - ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image" + ABS_JAVA_HOME_DIR="`pwd`/${OPENJDK_BUILD_DIR}/j2sdk-image" else ABS_JAVA_HOME_DIR="${withval}" - fi], [ABS_JAVA_HOME_DIR="`pwd`/openjdk/build/${BUILD_OS_DIR}-${BUILD_ARCH_DIR}/j2sdk-image"]) + fi], [ABS_JAVA_HOME_DIR="`pwd`/${OPENJDK_BUILD_DIR}/j2sdk-image"]) AC_MSG_RESULT([${ABS_JAVA_HOME_DIR}]) ABS_CLIENT_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/client/libjvm.so" ABS_SERVER_LIBJVM_SO="${ABS_JAVA_HOME_DIR}/jre/lib/${INSTALL_ARCH_DIR}/server/libjvm.so"