summaryrefslogtreecommitdiff
path: root/external/python3
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-09-09 10:44:56 +0300
committerTor Lillqvist <tml@collabora.com>2014-09-09 13:55:23 +0300
commit6492c8576e0393f7ee548cd938e84c80e8d37127 (patch)
tree2a633846a61c060481341389e104896b8a17598d /external/python3
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 'external/python3')
-rw-r--r--external/python3/GeneratedPackage_python3.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/python3/GeneratedPackage_python3.mk b/external/python3/GeneratedPackage_python3.mk
index 8ca47a919b7d..ffde38be586c 100644
--- a/external/python3/GeneratedPackage_python3.mk
+++ b/external/python3/GeneratedPackage_python3.mk
@@ -13,6 +13,6 @@ $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3))
$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3))
-$(eval $(call gb_GeneratedPackage_add_dir,python3,$(INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(LIBO_BIN_FOLDER))/LibreOfficePython.framework,LibreOfficePython.framework))
+$(eval $(call gb_GeneratedPackage_add_dir,python3,$(INSTROOT)/Frameworks/LibreOfficePython.framework,LibreOfficePython.framework))
# vim: set noet sw=4 ts=4: