From 49db70f6fd69f6df63b2efcd5f13d2f3142ff244 Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 31 Oct 2019 17:26:41 +0000
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 459972 -> 460700 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 9fbb2ce7169..3acad9d8083 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -869,7 +869,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 a4356362eaaa81786344c5e5695c83c7ac766371..d335aec936f8394d21d554ca81ec2b00a0fc56b2 100644
GIT binary patch
delta 539
zcmY*VO-NKx80F4)=gs(Na`a*2&wF?s3tc!d(ykcG3Zj9M2;In_uY5YD%=2eT%FQe!
zt4-N}XCrMR!i6+%UIfxW$}DXmu3V_JHYyQBg09Udc;PJWIp_P%;ahpBFTB<>IksV(
zRfT-LkIX0Lfc-F$HD_wDptCApnL(<K)t`J0b=Jb;(u)>@HJ{M;45pXp34>jqzss6n
z2U+#8o*m!QP}G^$_&+Ss)>aCg8crws$~m#8)?{L~XfO$nTQum~d{9J85k7CF%m<@Z
zpFJ>w=ooKA<+9?%)j6ug*BnJ5Hklvq{*v!F4coe>HaphO@iRx4u)ah(E<4h$zEJ|`
zb?5@bBKa}nPy=3dvpQ`4p#YX0s>k#`X|UgOKQceai{B1~5PYkgLnu$}`22x~j#L$P
zgg4;Yj>6IPf}cUZEjt80$t`nvS?T+>$B(U##Ic$u109D_&Fpxz689@l5ezNLLTi;W
z=%Pz8>=uqJ4*4+QQZ=TMN)2|uc$F$49;YU)w1{{1bl&W`p;ln&fNOzMB%Zs}8ZA3+
s-@g@?#;}Nqusmt_ibyA|lv;6WLLD4dvGq(bW(zJ!a0#zla20;%9|$43FaQ7m

delta 233
zcmbQ!FLR_*reO=?HQDxZc}5^++FmZtyk*+-JDF_U(`}Pkg{D84#4IuWf&&}x^xfN;
z#iq~N#>_jtVHPv%^n2Tw^`=*D2Fhw|2NLTyGYd@*+s-UA{lgY!mgygM0ExQo%;M9n
zXETdT{}aW;1u{Tty7wJMuIU0FnRupu04Xkb!NfORX$Q06^y_J?{L^#iFsn{~aF>l^
z`noMZi?-}wHh`NaJ6(D!Gyim*oy@w^-P#xhrdRG{ww=CjC$r>qu_mB|!7gU$>8CQ;
VWZM_-Vg_OsAZFdZco*AG9{@@|TUr1B

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 410f8cf8ef1..363a8a41dea 100644
--- a/odk/Module_odk.mk
+++ b/odk/Module_odk.mk
@@ -43,11 +43,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