diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:42:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-11 00:50:54 +0200 |
| commit | 5397b49f4dba9d065984a8b0eb356333c565217a (patch) | |
| tree | 8fa65285b27907c6620bfd48457018d92d63253c /pyuno | |
| parent | 06b632f0d367178b7266e50c6f140ef36984733f (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 'pyuno')
| -rw-r--r-- | pyuno/Package_python_scripts.mk | 2 | ||||
| -rw-r--r-- | pyuno/Package_python_shell.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index 9afe7f5739d4..c4fbfdd21869 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source)) -$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\ loader/pythonloader.py \ diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk index 306e2430ba20..7492be12db08 100644 --- a/pyuno/Package_python_shell.mk +++ b/pyuno/Package_python_shell.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell))) -$(eval $(call gb_Package_set_outdir,python_shell,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,python_shell,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,python_shell,$(gb_Package_PROGRAMDIRNAME)/python,python.sh)) |