[pkg-java] r10610 - trunk/mysql-connector-java/debian

[Michael Koch]

Author: mkoch
Date: 2009-09-25 19:45:08 +0000 (Fri, 25 Sep 2009)
New Revision: 10610

Modified:
   trunk/mysql-connector-java/debian/changelog
   trunk/mysql-connector-java/debian/rules
Log:
* In debian/rules always use JAVA_HOME when possible.

Modified: trunk/mysql-connector-java/debian/changelog
===================================================================
--- trunk/mysql-connector-java/debian/changelog	2009-09-25 19:41:41 UTC (rev 10609)
+++ trunk/mysql-connector-java/debian/changelog	2009-09-25 19:45:08 UTC (rev 10610)
@@ -8,6 +8,7 @@
   * Fixed watch file to use a decent FTP mirror.
   * Added automatic orig tarball creation on upstream updates.
   * Updated Standards-Version to 3.8.3.
+  * In debian/rules always use JAVA_HOME when possible.
 
  -- Michael Koch <konqueror at gmx.de>  Fri, 25 Sep 2009 21:10:44 +0200
 

Modified: trunk/mysql-connector-java/debian/rules
===================================================================
--- trunk/mysql-connector-java/debian/rules	2009-09-25 19:41:41 UTC (rev 10609)
+++ trunk/mysql-connector-java/debian/rules	2009-09-25 19:45:08 UTC (rev 10610)
@@ -26,7 +26,7 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(ANT_INVOKE) dist -Dcom.mysql.jdbc.java6.javac=/usr/lib/jvm/java-gcj/bin/javac -Dcom.mysql.jdbc.java6.rtjar=/usr/lib/jvm/java-gcj/lib/rt.jar
+	$(ANT_INVOKE) dist -Dcom.mysql.jdbc.java6.javac=$(JAVA_HOME)/bin/javac -Dcom.mysql.jdbc.java6.rtjar=$(JAVA_HOME)/lib/rt.jar
 	touch build-stamp
 
 clean: