From f1df418e2b8b4a2d6af31e23f29bd576b7c428a5 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Tue, 10 Jul 2018 20:07:55 +0100
Subject: [PATCH] javadoc-optional

Gemeinsame Unterverzeichnisse: odk-old/config und odk/config.
Gemeinsame Unterverzeichnisse: odk-old/docs und odk/docs.
Gemeinsame Unterverzeichnisse: odk-old/examples und odk/examples.

Gbp-Pq: Name javadoc-optional.diff
---
 Repository.mk             |   2 +-
 configure.ac              | Bin 450837 -> 451565 bytes
 odk/CustomTarget_check.mk |   2 +-
 odk/Module_odk.mk         |   6 ++++--
 odk/util/check.pl         |   2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index 4781d02af81..89370213450 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -849,7 +849,7 @@ $(eval $(call gb_Helper_register_packages_for_install,sdk,\
 	offapi_idl \
 	udkapi_idl \
 	$(if $(ENABLE_JAVA), \
-		odk_javadoc \
+		$(if $(JAVADOC),odk_javadoc) \
 		odk_uno_loader_classes \
 		odk_unowinreg \
 	) \
diff --git a/configure.ac b/configure.ac
index 0cb92742776d35df85a967509810af711ec4c8f3..890911ce27d0f13a69fc29e71beef623090c88a5 100644
GIT binary patch
delta 573
zcmY*VOK1~O6y@d4OeTY|)fug6QhXU|{m`)%byFEgwIHTQg`x{f2r-?u(UPEv5mB@*
zN;j59=5y#q5OJdmtteeuh2qAo)P;yUyYSPc?tJ;Q&<B_IIp>~p-|;`he|?P4ykWD(
zPK}E-b~RVcjhFHnxBuB54C`!Hxb=drcGkIdd9JgAQd)44G*}FObf#@$fx!}6&}j^D
zmW*92=O&$jx&gPWTZPJ$wW*rdS<n84b*8tsIYJ%Jws8BlQ_jp)4JInITs7$Ry$){W
zxY_L#b62LFY-#+O$&)rOmaz0rF>wBf62Z>}I*hDGyD{TZ6nEb%DmLb&FjlTh5{d8O
z$zmvhd6$mkMvW5q;?h1`_T(u3xpcsNrAonLl3;oi$H1bT!0#WVVa%gW+*zYG)Yh1U
z;;<4$&7%&aR%tKZdeo2gNl9;_-=31{Ug$ZA7mvgUeLfvS`^%8p(9QeQg`*ox4Mvr=
z-~lz=7JRZGKNOSP|0}Eb<dY3PODeKHg?F4AJ)0gHIb)k55iETT#qfQd<P(v4rZ<aa
zr^3^Nmj(qxi%b+6L5j_pE<26$HU_!_I@H&qw{%Tz^SZQoidUwbq88cKp-mL#QUQsQ
MM9IskK>3{h52jDIssI20

delta 198
zcmXAizY76z0LA0oT_Qh1j?Qf|ip6GN;v};2Kkx@g2C|VKckgV<Y80ysXCV9o%0FPU
zD&I1E-tzjq_daXpNgM23qv$vta|zssbPSt5A0@@d`xG9&^Rk!UCCYrwAhTy8Lv@Zg
z9aBVYjxawak{t9QF>XPl@kEq$3n}_qQh@7@;^)GG%5KCR;L$>kp#>^z64}2tA#_$R
n;?kjL_g93d+9<GXBf)$_4)SJ;Wqk;JTwFmQ3FJd@rEHBKbx1{Z

diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk
index f0b63489f05..2d9d5ee6dcb 100644
--- a/odk/CustomTarget_check.mk
+++ b/odk/CustomTarget_check.mk
@@ -35,7 +35,7 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \
 		$(if $(filter WNT,$(OS)),$(call gb_Package_get_target,odk_config_win)) \
 		$(call gb_Package_get_target,odk_docs) \
 		$(call gb_Package_get_target,odk_html) \
-		$(if $(ENABLE_JAVA),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
+		$(if $(JAVADOC),$(call gb_GeneratedPackage_get_target,odk_javadoc)) \
 		$(call gb_Package_get_target,odk_settings) \
 		$(call gb_Package_get_target,odk_settings_generated) \
 		$(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg))
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk
index 4ca21d3eaf3..8f5c422ecfa 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -41,11 +41,13 @@ ifneq ($(ENABLE_JAVA),)
 $(eval $(call gb_Module_add_targets,odk,\
 	$(if $(and $(BUILD_UNOWINREG),$(filter GCC,$(COM))),CustomTarget_unowinreg)\
 	CustomTarget_classes \
-	CustomTarget_javadoc \
-	GeneratedPackage_odk_javadoc \
 	GeneratedPackage_uno_loader_classes \
 	$(if $(filter WNT,$(OS)),Library_unowinreg) \
 	Package_unowinreg \
+	$(if $(JAVADOC),\
+		CustomTarget_javadoc \
+		GeneratedPackage_odk_javadoc \
+	) \
 ))
 endif
 
diff --git a/odk/util/check.pl b/odk/util/check.pl
index 03b58fe3da7..63e332079bc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -184,7 +184,7 @@ if (-d "$SdkDir") {
     # improvement required
     my $solar_java = $ENV{"ENABLE_JAVA"};
     my $JDK = $ENV{"JDK"};
-    if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) {
+    if (defined($solar_java) && $solar_java ne "" && $ENV{"JAVADOC"} ne "") {
     print "check java docu: ";
     if (check_dir("docs/java/ref")) {
         if (!check_file("docs/java/ref/index.html")) {
-- 
2.30.2