feedback on --enable-java-home

[Andrew John Hughes]

2009/3/3 Andrew John Hughes <gnu_andrew@member.fsf.org>:
> 2009/3/3 Andrew Haley <aph@redhat.com>:
>> Andrew John Hughes wrote:
>>
>>> 2009-03-03  Andrew John Hughes  <ahughes@redhat.com>
>>>
>>>       * Makefile.am:
>>>       Remove dangling src.zip and javac symlinks.
>>>       * Makefile.in,
>>>       * configure: Regenerated.
>>>       * configure.ac: Drop hard-coded prefix,
>>>       thus removing sdk_dir and making jre_dir="jre".
>>>       Map x86_64 to amd64 as used by OpenJDK.
>>>       * gcj/Makefile.in,
>>>       * include/Makefile.in,
>>>       * testsuite/Makefile.in: Regenerated.
>>>
>>>
>>> Ok for trunk?
>>
>> I'm having difficulty with this since there seem to be a bunch
>> of autogenerated files mixed in.  Can you please resubmit for
>> the list?
>>
>> Thanks,
>> Andrew.
>>
>>
>
> The diff for just configure.ac and Makefile.am is attached.
> --
> Andrew :-)
>
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
>
> Support Free Java!
> Contribute to GNU Classpath and the OpenJDK
> http://www.gnu.org/software/classpath
> http://openjdk.java.net
>
> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>

New version attached with the additional change to the java.security symlink.
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
-------------- next part --------------
Index: libjava/configure.ac
===================================================================
--- libjava/configure.ac	(revision 144571)
+++ libjava/configure.ac	(working copy)
@@ -1809,8 +1809,7 @@
   AC_SUBST(BUILD_VERSION)
   AC_MSG_RESULT(Java version: ${JAVA_VERSION})
 
-  jre_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}/jre
-  sdk_dir=java-${JAVA_VERSION}-${origin_name}-${JAVA_VERSION}.${BUILD_VERSION}${arch_suffix}
+  jre_dir=jre
   jre_lnk=jre-${JAVA_VERSION}-${origin_name}
   sdk_lnk=java-${JAVA_VERSION}-${origin_name}
 
@@ -1822,31 +1821,28 @@
   AC_SUBST(JVM_JAR_ROOT_DIR)
   AC_MSG_RESULT(JVM JAR ROOT directory: ${JVM_JAR_ROOT_DIR})
 
-  JVM_JAR_DIR=${jvm_jar_dir}/${sdk_dir}
+  JVM_JAR_DIR=${jvm_jar_dir}
   AC_SUBST(JVM_JAR_DIR)
   AC_MSG_RESULT(JVM JAR directory: ${JVM_JAR_DIR})
 
   JRE_DIR=${jre_dir}
   AC_SUBST(JRE_DIR)
 
-  SDK_DIR=${sdk_dir}
-  AC_SUBST(SDK_DIR)
-
   JRE_LNK=${jre_lnk}
   AC_SUBST(JRE_LNK)
 
   SDK_LNK=${sdk_lnk}
   AC_SUBST(SDK_LNK)
 
-  SDK_BIN_DIR=${jvm_root_dir}/${sdk_dir}/bin
+  SDK_BIN_DIR=${jvm_root_dir}/bin
   AC_SUBST(SDK_BIN_DIR)
   AC_MSG_RESULT(SDK tools directory: ${SDK_BIN_DIR})
 
-  SDK_LIB_DIR=${jvm_root_dir}/${sdk_dir}/lib
+  SDK_LIB_DIR=${jvm_root_dir}/lib
   AC_SUBST(SDK_LIB_DIR)
   AC_MSG_RESULT(SDK jar directory: ${SDK_LIB_DIR})
 
-  SDK_INCLUDE_DIR=${jvm_root_dir}/${sdk_dir}/include
+  SDK_INCLUDE_DIR=${jvm_root_dir}/include
   AC_SUBST(SDK_INCLUDE_DIR)
   AC_MSG_RESULT(SDK include directory: ${SDK_INCLUDE_DIR})
 
@@ -1868,7 +1864,7 @@
   AC_SUBST(GCJ_BIN_DIR)
   AC_MSG_RESULT(GCJ tools directory: ${GCJ_BIN_DIR})
 
-  echo host is ${host}
+  AC_MSG_RESULT(host is ${host})
   if test "x${host_cpu}" = "x"
   then
     case ${host} in
@@ -1876,6 +1872,8 @@
         host_cpu=x86;;
       i486-* | i586-* | i686-*)
         host_cpu=i386;;
+      x86_64-*)
+        host_cpu=amd64;;
       *)
         host_cpu=${host_cpu};;
     esac
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am	(revision 144571)
+++ libjava/Makefile.am	(working copy)
@@ -586,7 +586,6 @@
 	  $(DESTDIR)$(SDK_BIN_DIR)/rmic; \
 	ln -sf $$RELATIVE/`echo gjavah | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 	  $(DESTDIR)$(SDK_BIN_DIR)/javah; \
-	ln -sf $$RELATIVE/ecj $(DESTDIR)$(SDK_BIN_DIR)/javac; \
 	ln -sf $$RELATIVE/`echo gappletviewer | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
 	  $(DESTDIR)$(SDK_BIN_DIR)/appletviewer; \
 	ln -sf $$RELATIVE/`echo gjarsigner | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` \
@@ -638,7 +637,7 @@
 	  done; \
 	cd $$working_dir; \
 	$(mkinstalldirs) $(DESTDIR)$(JRE_LIB_DIR)/security; \
-	RELATIVE=$$(relative $(DESTDIR)$(libdir)/security \
+	RELATIVE=$$(relative $(DESTDIR)$(toolexeclibdir)/security \
 	  $(DESTDIR)$(JRE_LIB_DIR)/security); \
 	cd $(DESTDIR)$(JRE_LIB_DIR)/security; \
 	  ln -sf $$RELATIVE/classpath.security java.security; \
@@ -684,9 +683,7 @@
 	    $(DESTDIR)$(SDK_INCLUDE_DIR)/linux/$$headername.h; \
 	done; \
 	RELATIVE=$$(relative $(DESTDIR)$(datadir)/java \
-	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); \
-	ln -sf $$RELATIVE/src-$(gcc_version).zip \
-	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)/src.zip;
+	  $(DESTDIR)$(JVM_ROOT_DIR)/$(SDK_DIR)); 
 endif
 
 ## ################################################################