/hg/icedtea6: Get configure and make BUILD_DIR in sync.

[mjw at icedtea.classpath.org]

changeset 38a53f071801 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=38a53f071801
author: Mark Wielaard <mark at klomp.org>
date: Tue Jul 20 20:26:03 2010 +0200

	Get configure and make BUILD_DIR in sync.

	2010-07-20 Mark Wielaard <mjw at redhat.com>

	 * configure.ac (OPENJDK_BUILD_DIR): New AC_SUBST variable.
	(with-abs-install-dir): Based on OPENJDK_BUILD_DIR when not given.
		* Makefile.am (BUILD_DIR): Set to @OPENJDK_BUILD_DIR at .


diffstat:

3 files changed, 11 insertions(+), 3 deletions(-)
ChangeLog    |    6 ++++++
Makefile.am  |    2 +-
configure.ac |    6 ++++--

diffs (50 lines):

diff -r b110028e95cc -r 38a53f071801 ChangeLog
--- a/ChangeLog	Tue Jul 20 13:39:49 2010 -0400
+++ b/ChangeLog	Tue Jul 20 20:26:03 2010 +0200
@@ -1,3 +1,9 @@ 2010-07-20  Omair Majid  <omajid at redhat.
+2010-07-20  Mark Wielaard  <mjw at redhat.com>
+
+	* configure.ac (OPENJDK_BUILD_DIR): New AC_SUBST variable.
+	(with-abs-install-dir): Based on OPENJDK_BUILD_DIR when not given.
+	* Makefile.am (BUILD_DIR): Set to @OPENJDK_BUILD_DIR at .
+
 2010-07-20  Omair Majid  <omajid at redhat.com>
 
 	PR icedtea/491
diff -r b110028e95cc -r 38a53f071801 Makefile.am
--- a/Makefile.am	Tue Jul 20 13:39:49 2010 -0400
+++ b/Makefile.am	Tue Jul 20 20:26:03 2010 +0200
@@ -27,7 +27,7 @@ HOTSPOT_SRC_ZIP = hotspot.tar.gz
 
 # 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 b110028e95cc -r 38a53f071801 configure.ac
--- a/configure.ac	Tue Jul 20 13:39:49 2010 -0400
+++ b/configure.ac	Tue Jul 20 20:26:03 2010 +0200
@@ -140,6 +140,8 @@ IT_GET_LSB_DATA
 
 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 @@ public:
 	      [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="${abs_top_builddir}/${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="${abs_top_builddir}/${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"