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 /postprocess | |
| 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 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 2 | ||||
| -rw-r--r-- | postprocess/Package_images.mk | 2 | ||||
| -rw-r--r-- | postprocess/Package_registry_install.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 541941c7aaa8..8e892a12461e 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -70,6 +70,6 @@ $(packimages_DIR)/sorted.lst : \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ - $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTDIR)/$(gb_UIConfig_INSTDIR) $@) + $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(gb_INSTROOT)/$(gb_UIConfig_INSTDIR) $@) # vim: set noet sw=4 ts=4: diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk index af98789b967e..f550af3e7a62 100644 --- a/postprocess/Package_images.mk +++ b/postprocess/Package_images.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images))) -$(eval $(call gb_Package_set_outdir,postprocess_images,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,postprocess_images,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,postprocess_images,$(LIBO_SHARE_FOLDER)/config,\ $(if $(filter default,$(WITH_THEMES)),images.zip) \ diff --git a/postprocess/Package_registry_install.mk b/postprocess/Package_registry_install.mk index d21d2a28d722..5f8ed00cdee7 100644 --- a/postprocess/Package_registry_install.mk +++ b/postprocess/Package_registry_install.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,postprocess_registry_install,$(call gb_CustomTarget_get_workdir,postprocess/registry))) -$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\ $(postprocess_XCDS) \ |