[tomcat8] 03/04: Build the Javadoc with the JDK specified by the JAVA_HOME variable instead of the default JDK

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch wheezy-backports
in repository tomcat8.

commit 20ebae8605ad2043359963000aa03d624a6661a1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 27 12:32:20 2014 +0200

    Build the Javadoc with the JDK specified by the JAVA_HOME variable instead of the default JDK
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 42d1a11..3e337f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ tomcat8 (8.0.9-1~bpo70+1) wheezy-backports; urgency=low
 
   * Rebuild for wheezy-backports
     - Depend on openjdk-7 instead of openjdk-6 which is the default in Wheezy
+    - Build the Javadoc with the JDK specified by the JAVA_HOME variable
+      instead of the default JDK
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 25 Jun 2014 08:55:40 +0200
 
diff --git a/debian/rules b/debian/rules
index 48d04ef..7f445d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -62,7 +62,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 else
 	$(ANT_INVOKE) deploy
 endif
-	javadoc -subpackages "javax.servlet:javax.el:javax.websocket" -d "output/api" \
+	$(JAVA_HOME)/bin/javadoc -subpackages "javax.servlet:javax.el:javax.websocket" -d "output/api" \
 		-sourcepath "java" -author -version -breakiterator \
 		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
 		-bottom "Copyright © 2000-2014 The Apache Software Foundation. All Rights Reserved."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat8.git