r1929 - trunk/eclipse/debian

[Matthias Klose]

Author: doko
Date: 2006-02-19 09:51:13 +0000 (Sun, 19 Feb 2006)
New Revision: 1929

Modified:
   trunk/eclipse/debian/changelog
   trunk/eclipse/debian/rules
Log:
* Set JAVA_HOME for the build (needed for non-matching gcc/gcj versions).


Modified: trunk/eclipse/debian/changelog
===================================================================
--- trunk/eclipse/debian/changelog	2006-02-18 20:08:11 UTC (rev 1928)
+++ trunk/eclipse/debian/changelog	2006-02-19 09:51:13 UTC (rev 1929)
@@ -14,6 +14,7 @@
   * debian/extra/eclipse.sh: Make sure to use /usr/lib/mozilla as
     MOZILLA_HOME in any case.
   * debian/rules: Set a default for MOZILLA_HOME.
+  * Set JAVA_HOME for the build (needed for non-matching gcc/gcj versions).
 
  -- Michael Koch <konqueror at gmx.de>  Thu, 16 Feb 2006 08:52:25 +0000
 

Modified: trunk/eclipse/debian/rules
===================================================================
--- trunk/eclipse/debian/rules	2006-02-18 20:08:11 UTC (rev 1928)
+++ trunk/eclipse/debian/rules	2006-02-19 09:51:13 UTC (rev 1929)
@@ -41,6 +41,8 @@
 SOURCE_VERSION=$(shell head -1 debian/changelog | sed -e 's/^.*(\(.*\)).*$$/\1/')
 UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | sed -e 's/-.*$$//')
 
+export JAVA_HOME=/usr/lib/jvm/java-gcj
+
 # GCJ configuration
 # GCJ_RUN		command line to launch gcj
 # AOT_COMPILE		command line to AOT compile jars to native
@@ -136,7 +138,8 @@
 	eclipse-link-classpathdoc \
 	eclipse-gjdoc-reflection \
 	eclipse-public-applypatch \
-	eclipse-heapstatus
+	eclipse-heapstatus \
+	eclipse-java-home \
 
 #	eclipse-java-model-cache \