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 /extras/Package_labels.mk | |
| parent | Fix notes jumps. (diff) | |
| download | core-5397b49f4dba9d065984a8b0eb356333c565217a.tar.gz core-5397b49f4dba9d065984a8b0eb356333c565217a.zip | |
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 'extras/Package_labels.mk')
| -rw-r--r-- | extras/Package_labels.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk index ef64e5a0cd83..9d188d7e03d4 100644 --- a/extras/Package_labels.mk +++ b/extras/Package_labels.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels)) -$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,extras_labels,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,extras_labels,$(LIBO_SHARE_FOLDER)/labels/labels.xml,labels.xml)) |