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 /desktop | |
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 'desktop')
-rw-r--r-- | desktop/Package_branding.mk | 2 | ||||
-rw-r--r-- | desktop/Package_branding_custom.mk | 2 | ||||
-rw-r--r-- | desktop/Package_scripts_install.mk | 2 | ||||
-rw-r--r-- | desktop/Package_soffice_bin.mk | 2 | ||||
-rw-r--r-- | desktop/Package_soffice_sh.mk | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index 5d7dbf5c03ed..25fdbb6f80d3 100644 --- a/desktop/Package_branding.mk +++ b/desktop/Package_branding.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy)) -$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,desktop_branding,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\ $(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\ diff --git a/desktop/Package_branding_custom.mk b/desktop/Package_branding_custom.mk index 5713d3f8b367..eed749618cb7 100644 --- a/desktop/Package_branding_custom.mk +++ b/desktop/Package_branding_custom.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_branding_custom,$(CUSTOM_BRAND_DIR))) -$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk index c64c2bdba0e9..2d36a59d190e 100644 --- a/desktop/Package_scripts_install.mk +++ b/desktop/Package_scripts_install.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_scripts_install,$(SRCDIR)/desktop/scripts)) -$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(gb_INSTROOT))) ifneq ($(OS),WNT) diff --git a/desktop/Package_soffice_bin.mk b/desktop/Package_soffice_bin.mk index 923742697631..acc9cab86dc5 100644 --- a/desktop/Package_soffice_bin.mk +++ b/desktop/Package_soffice_bin.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_soffice_bin,$(gb_Executable_BINDIR))) -$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,desktop_soffice_bin,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,desktop_soffice_bin,$(LIBO_BIN_FOLDER)/soffice.bin,soffice_bin$(gb_Executable_EXT))) diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk index 757c6817e8f9..f1a58fef3341 100644 --- a/desktop/Package_soffice_sh.mk +++ b/desktop/Package_soffice_sh.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice))) -$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(gb_INSTROOT))) $(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh)) |