From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Fri, 20 Mar 2020 15:23:39 +0000 (+0000)
Subject: javadoc-optional
X-Git-Tag: archive/raspbian/1%6.4.2-2+rpi1^2~26
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9fd7bad3ca79e271f0f4bb9289cc608202fdbb8c;p=libreoffice.git

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.

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
---

diff --git a/Repository.mk b/Repository.mk
index 5b837ec5443..e447757bcb8 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -863,7 +863,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 4cd00d131ce..744bd1a5908 100644
Binary files a/configure.ac and b/configure.ac differ
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 be03d40ff58..bed51e1c7a6 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")) {