changeset in /hg/icedtea6: A couple of extras spotted by doko:

[Andrew John Hughes]

changeset 8634e13d4a4a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=8634e13d4a4a
description:
	A couple of extras spotted by doko:

	2008-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Prefix the call to uname -m with
		the ${ARCH_PREFIX}.
		* acinclude.m4:
		Apply linux32 on s390 as well.

diffstat:

3 files changed, 10 insertions(+), 1 deletion(-)
ChangeLog    |    8 ++++++++
Makefile.am  |    2 +-
acinclude.m4 |    1 +

diffs (38 lines):

diff -r c6e9607b19f0 -r 8634e13d4a4a ChangeLog
--- a/ChangeLog	Thu Dec 04 17:24:48 2008 +0000
+++ b/ChangeLog	Thu Dec 04 17:49:29 2008 +0000
@@ -1,3 +1,11 @@ 2008-12-04  Andrew John Hughes  <gnu_and
+2008-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Prefix the call to uname -m with
+	the ${ARCH_PREFIX}.
+	* acinclude.m4:
+	Apply linux32 on s390 as well.
+
 2008-12-04  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r c6e9607b19f0 -r 8634e13d4a4a Makefile.am
--- a/Makefile.am	Thu Dec 04 17:24:48 2008 +0000
+++ b/Makefile.am	Thu Dec 04 17:49:29 2008 +0000
@@ -1764,7 +1764,7 @@ if WITH_VISUALVM
 	ln -s $(SYSTEM_NETBEANS_DIR)/java2/ ./nbbuild/netbeans/java2 ; \
 	ln -s $(SYSTEM_NETBEANS_DIR)/ide9/ ./nbbuild/netbeans/ide9 ; \
 	cd profiler.cvs/libs/jfluid/native/build ; \
-	if ! (uname -a | grep x86_64) ; then \
+	if ! ($(ARCH_PREFIX) uname -a | grep x86_64) ; then \
 	  buildscript=./buildnative-linux-15.sh ; \
 	else \
 	  buildscript=./buildnative-linux64-15.sh ; \
diff -r c6e9607b19f0 -r 8634e13d4a4a acinclude.m4
--- a/acinclude.m4	Thu Dec 04 17:24:48 2008 +0000
+++ b/acinclude.m4	Thu Dec 04 17:49:29 2008 +0000
@@ -52,6 +52,7 @@ AC_DEFUN([SET_ARCH_DIRS],
       BUILD_ARCH_DIR=s390
       INSTALL_ARCH_DIR=s390
       JRE_ARCH_DIR=s390
+      ARCH_PREFIX=${LINUX32}
        ;;
     *)
       BUILD_ARCH_DIR=`uname -m`