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/AllLangPackage.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/AllLangPackage.mk')
-rw-r--r-- | solenv/gbuild/AllLangPackage.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/AllLangPackage.mk b/solenv/gbuild/AllLangPackage.mk index 77e3e2526881..7039a2ea8021 100644 --- a/solenv/gbuild/AllLangPackage.mk +++ b/solenv/gbuild/AllLangPackage.mk @@ -10,7 +10,7 @@ # AllLangPackage class # Handles creation of a bunch of packages with content dependent on -# language. The package files are placed into $(INSTDIR). +# language. The package files are placed into $(gb_INSTROOT). gb_AllLangPackage_LANGS := $(if $(strip $(gb_WITH_LANG)),$(gb_WITH_LANG),en-US) @@ -44,7 +44,7 @@ endef # gb_AllLangPackage__AllLangPackage_lang group package srcdir define gb_AllLangPackage__AllLangPackage_onelang $(call gb_Package_Package_internal,$(2),$(3)) -$(call gb_Package_set_outdir,$(2),$(INSTDIR)) +$(call gb_Package_set_outdir,$(2),$(gb_INSTROOT)) $(call gb_AllLangPackage_get_target,$(1)) : $(call gb_Package_get_target,$(2)) $(call gb_AllLangPackage_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(2)) |