[pkg-java] r6391 - branches/eclipse/eclipse-3.2/debian

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-05-02 06:38:50 +0000 (Fri, 02 May 2008)
New Revision: 6391

Modified:
   branches/eclipse/eclipse-3.2/debian/rules
Log:
change JAVA_HOME to default-java

Modified: branches/eclipse/eclipse-3.2/debian/rules
===================================================================
--- branches/eclipse/eclipse-3.2/debian/rules	2008-05-02 06:35:00 UTC (rev 6390)
+++ branches/eclipse/eclipse-3.2/debian/rules	2008-05-02 06:38:50 UTC (rev 6391)
@@ -70,7 +70,7 @@
 UPSTREAM_VERSION=$(shell echo $(SOURCE_VERSION) | sed -e 's/-.*$$//')
 REL=v3236
 
-export JAVA_HOME=/usr/lib/jvm/java-gcj
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 # GCJ configuration
 # GCJ_RUN		command line to launch gcj
@@ -84,7 +84,7 @@
 # Virtual machine configuration.
 # JAVA_RUN		command line to start the virtual machine
 # JAVA_CLASSPATH	classpath components neccassary for the VM to function
-JAVA_RUN=/usr/lib/jvm/java-gcj/bin/java
+JAVA_RUN=$(JAVA_HOME)/bin/java
 JAVA_CLASSPATH=
 
 # Ant configuration.
@@ -417,7 +417,7 @@
 	# Update build ids in configuration files
 	cd $(SOURCE_TREE) && \
 	$(ECJ_ANT_RUN) \
-		-Djava5.home=/usr/lib/jvm/java-gcj \
+		-Djava5.home=$(JAVA_HOME) \
 		-Djava.endorsed.dirs=$(SOURCE_TREE)/plugins/org.eclipse.tomcat \
 		-Dnobootstrap=true \
 		-DinstallOs=linux \
@@ -439,7 +439,7 @@
 	# components as well.
 	cd $(SOURCE_TREE) && \
 	$(ECJ_ANT_RUN) \
-		-Djava5.home=/usr/lib/jvm/java-gcj \
+		-Djava5.home=$(JAVA_HOME) \
 		-Djava.endorsed.dirs=$(SOURCE_TREE)/plugins/org.eclipse.tomcat \
 		-Dnobootstrap=true \
 		-DinstallOs=linux \
@@ -460,7 +460,7 @@
 	# debugging purposes: it takes a long time.
 	cd $(SOURCE_TREE) && \
 	$(ECJ_ANT_RUN) \
-		-Djava5.home=/usr/lib/jvm/java-gcj \
+		-Djava5.home=$(JAVA_HOME) \
 		-Dconfiguration=linux.gtk.$(ECLIPSE_PLATFORM) \
 		-DinstallOs=linux \
 		-DinstallWs=gtk \