The following commit has been merged in the master branch:
commit e4bef6f9576bc0a85aec547e11982bced9daafc7
Author: Jakub Adam <[email protected]>
Date: Sat Nov 3 20:13:44 2012 +0100
jh_build: Fix wrong javadoc output location
Signed-off-by: Niels Thykier <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index b9b93d7..4d3393b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ javatools (0.44) UNRELEASED; urgency=low
* Fix bug in jh_repack when removing empty directories.
Thanks to Francesco Poli for reporting it and writing
the patch. (Closes: #689788)
+ * Fix the output path for javadoc generated by jh_build.
+ Thanks to Jakub Adam for reporting it and writing the
+ patch. (Closes: #692230)
-- Niels Thykier <[email protected]> Wed, 20 Mar 2013 14:40:31 +0100
diff --git a/jh_build b/jh_build
index 653d083..137445a 100755
--- a/jh_build
+++ b/jh_build
@@ -129,9 +129,9 @@ function dobuild()
if [ -n "`getarg J javadoc`" ] || [ -z "`getarg N no-javadoc`"
]; then
if [ -z "`getarg q quiet`" ]; then
- echo $JAVADOC $CLASSPATHDOCS -classpath
$CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc.ext/api -quiet
$JH_JAVADOC_OPTS $srcfiles
+ echo $JAVADOC $CLASSPATHDOCS -classpath
$CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet
$JH_JAVADOC_OPTS $srcfiles
fi
- $JAVADOC $CLASSPATHDOCS -classpath
$CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc.ext/api -quiet
$JH_JAVADOC_OPTS $srcfiles
+ $JAVADOC $CLASSPATHDOCS -classpath
$CLASSPATH:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet
$JH_JAVADOC_OPTS $srcfiles
fi
else
--
UNNAMED PROJECT
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
