diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 09:44:04 +0000 |
| commit | eb358d77291eba677141bab113dc27d7aabb0f3e (patch) | |
| tree | 2e96f3b5d0c79beaeb536bbf05c3b8564846e65f /ridljar/Jar_libreoffice.mk | |
| parent | Adding debian version 4:24.2.1-4. (diff) | |
| download | libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.tar.xz libreoffice-eb358d77291eba677141bab113dc27d7aabb0f3e.zip | |
Merging upstream version 4:24.2.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'ridljar/Jar_libreoffice.mk')
| -rw-r--r-- | ridljar/Jar_libreoffice.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ridljar/Jar_libreoffice.mk b/ridljar/Jar_libreoffice.mk index 76a56eedc0..77397bc246 100644 --- a/ridljar/Jar_libreoffice.mk +++ b/ridljar/Jar_libreoffice.mk @@ -36,12 +36,12 @@ $(eval $(call gb_Jar_add_manifest_classpath,libreoffice, \ $(eval $(call gb_Jar_add_packagedirs,libreoffice,\ $(call gb_CustomTarget_get_workdir,ridljar/javamaker)/com \ $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \ - $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class \ + $(if $(MODULAR_JAVA),$(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,libreoffice))/module-info.class) \ )) -$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ +$(if $(MODULAR_JAVA),$(eval $(call gb_Jar_add_sourcefiles_java9,libreoffice,\ ridljar/source/libreoffice/module-info \ -)) +))) $(eval $(call gb_Jar_add_sourcefiles,libreoffice,\ ridljar/com/sun/star/comp/bridgefactory/BridgeFactory \ |