path: root/jvmfwk/
diff options
authorTor Lillqvist <>2014-09-09 10:44:56 +0300
committerTor Lillqvist <>2014-09-09 13:55:23 +0300
commit6492c8576e0393f7ee548cd938e84c80e8d37127 (patch)
tree2a633846a61c060481341389e104896b8a17598d /jvmfwk/
parent43efd9b40d40b791a2c2deedcac36b99f7efb2cf (diff)
Make the "Mac-like" or "canonical" app bundle structure always used on OS X
In other words, only executable files go in the MacOS folder. Dynamic libraries and bundled frameworks (i.e., LibreOfficePython), and nothing else, go in the Frameworks folder, and all other files go in the Resources folder. Especially, note that Java class files and rc (.ini) files also go in Resources. Such an app bundle structure is what Apple strongly suggests one should use, and it has been hinted that future versions of code signing and/or Gatekeeper will require such a structure. There is still some ugliness thanks to traces of the historical separation of URE from "the office". Like there are two separate "unorc" files, one for URE, one for the LibreOffice application. IMHO, this should be cleaned up, but is probably controversial. (Eek! I now see there are actually *three* unorc files in the app bundle. Not intentional. Need to fix that later.) Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606
Diffstat (limited to 'jvmfwk/')
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/ b/jvmfwk/
index ce113ebe4dd5..cd12402c6045 100644
--- a/jvmfwk/
+++ b/jvmfwk/
@@ -9,6 +9,6 @@
$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)))
-$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(LIBO_URE_LIB_FOLDER)/JREProperties.class,JREProperties.class))
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,$(if $(filter MACOSX,$(OS)),$(LIBO_URE_SHARE_JAVA_FOLDER),$(LIBO_URE_LIB_FOLDER))/JREProperties.class,JREProperties.class))
# vim:set noet sw=4 ts=4: