diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 19:59:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 00:54:43 +0300 |
| commit | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch) | |
| tree | eac7091c6fa969ed652f8ae23d775b13a30b2b66 /desktop | |
| parent | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (diff) | |
Try to fix cross-compilation
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
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_desktop_install.mk | 2 | ||||
| -rw-r--r-- | desktop/Package_scripts_install.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 25fdbb6f80d3..a7f9bc0e2def 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,desktop_branding,$(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 eed749618cb7..e7ceefd3bd0a 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,desktop_branding_custom,$(INSTROOT))) $(eval $(call gb_Package_add_files,desktop_branding_custom,$(gb_PROGRAMDIRNAME),\ $(filter $(BRAND_INTRO_IMAGES),$(CUSTOM_BRAND_IMAGES)) \ diff --git a/desktop/Package_desktop_install.mk b/desktop/Package_desktop_install.mk index 6740f777f654..ad7a74ca8172 100644 --- a/desktop/Package_desktop_install.mk +++ b/desktop/Package_desktop_install.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,desktop_install,$(SRCDIR))) -$(eval $(call gb_Package_set_outdir,desktop_install,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,desktop_install,$(INSTROOT))) $(eval $(call gb_Package_add_symbolic_link,desktop_install,program,MacOS)) diff --git a/desktop/Package_scripts_install.mk b/desktop/Package_scripts_install.mk index 2d36a59d190e..a3202071e17b 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,desktop_scripts_install,$(INSTROOT))) ifneq ($(OS),WNT) diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk index f1a58fef3341..8c5db5bff42a 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTROOT))) $(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh)) |