summaryrefslogtreecommitdiff
path: root/python3
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-09-11 00:42:52 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-09-11 00:50:54 +0200
commit5397b49f4dba9d065984a8b0eb356333c565217a (patch)
tree8fa65285b27907c6620bfd48457018d92d63253c /python3
parent06b632f0d367178b7266e50c6f140ef36984733f (diff)
Towards a working instdir for Mac OS X
Introduced gb_INSTROOT, which is the same as $(INSTDIR) except for Mac OS X, where it is $(INSTDIR)/LibreOffice.app/Contents. Most stuff ends up there (so most occurrences of $(INSTDIR) have been replaced with $(gb_INSTROOT)), but SDK- related stuff goes to $(INSTDIR)/$(gb_Package_SDKDIRNAME). (And GeneratedPackage needed to be made more flexible, to allow for packages that go into either of those two places.) For Android and iOS, gb_INSTROOT probably still needs to be set. The most obvious missing thing yet to make instdir work for Mac OS X is the instdir/*/LibreOffice.app/Contents/ure/ vs. instdir/*/LibreOffice.app/Contents/ure-link/ split. Change-Id: I4478edd27b14c92c96d92d5169bdca3ec50d78f5
Diffstat (limited to 'python3')
-rw-r--r--python3/ExternalPackage_python3.mk2
-rw-r--r--python3/GeneratedPackage_python3.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk
index 597062cd3f80..6c513090b21a 100644
--- a/python3/ExternalPackage_python3.mk
+++ b/python3/ExternalPackage_python3.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3))
-$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTDIR)))
+$(eval $(call gb_ExternalPackage_set_outdir,python3,$(gb_INSTROOT)))
$(eval $(call gb_ExternalPackage_use_external_project,python3,python3))
diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk
index d87bfba57c59..823407127d06 100644
--- a/python3/GeneratedPackage_python3.mk
+++ b/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,$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework))
+$(eval $(call gb_GeneratedPackage_add_dir,python3,$(gb_INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework))
# vim: set noet sw=4 ts=4: