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/ExternalPackage.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/ExternalPackage.mk')
| -rw-r--r-- | solenv/gbuild/ExternalPackage.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/ExternalPackage.mk b/solenv/gbuild/ExternalPackage.mk index 9d6a52cd82d5..9015af2e9a00 100644 --- a/solenv/gbuild/ExternalPackage.mk +++ b/solenv/gbuild/ExternalPackage.mk @@ -199,7 +199,7 @@ define gb_ExternalPackage__add_file_for_install $(call gb_ExternalPackage_add_file,$(1),$(2),$(4)) $(call gb_Helper_install,$(call gb_ExternalPackage_get_target,$(1)), \ - $(INSTDIR)/$(3), \ + $(gb_INSTROOT)/$(3), \ $(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4)) $(call gb_UnpackedTarball_get_dir,$(gb_ExternalPackage_UNPACKED_$(1)))/$(4) :| \ @@ -211,7 +211,7 @@ endef # # This function is very similar to gb_ExternalPackage_add_file, except # that it also allows to deliver the library to its proper place in -# $(INSTDIR). +# $(gb_INSTROOT). # # The last argument is the name under which the library was registered. # It is used to determine layer, if the library is not in layer OOO. @@ -234,7 +234,7 @@ endef # # This function works just like to gb_ExternalPackage_add_file, except # that it also allows to deliver the jar to its proper place in -# $(INSTDIR). +# $(gb_INSTROOT). # # gb_ExternalPackage_add_jar_for_install package dest src define gb_ExternalPackage_add_jar_for_install |