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 /solenv/gbuild/Dictionary.mk | |
| 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 'solenv/gbuild/Dictionary.mk')
| -rw-r--r-- | solenv/gbuild/Dictionary.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk index eb7ba2155512..a1e4d614430b 100644 --- a/solenv/gbuild/Dictionary.mk +++ b/solenv/gbuild/Dictionary.mk @@ -213,8 +213,8 @@ $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)),$( $(call gb_Package_Package_internal,$(call gb_Dictionary_get_packagename,$(1)_generated),$(WORKDIR)) $(call gb_PackageSet_PackageSet_internal,$(call gb_Dictionary_get_packagesetname,$(1))) -$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(INSTDIR)) -$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(INSTDIR)) +$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)),$(gb_INSTROOT)) +$(call gb_Package_set_outdir,$(call gb_Dictionary_get_packagename,$(1)_generated),$(gb_INSTROOT)) $(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1))) ifeq (,$(gb_Dictionary_ALL_LANGS)) |