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 /sd | |
| 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 'sd')
| -rw-r--r-- | sd/Package_opengl.mk | 2 | ||||
| -rw-r--r-- | sd/Package_web.mk | 2 | ||||
| -rw-r--r-- | sd/Package_xml.mk | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/Package_opengl.mk b/sd/Package_opengl.mk index 0e7d975ac7d6..d3810b716922 100644 --- a/sd/Package_opengl.mk +++ b/sd/Package_opengl.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,sd_opengl,$(SRCDIR)/sd/xml)) -$(eval $(call gb_Package_set_outdir,sd_opengl,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,sd_opengl,$(INSTROOT))) $(eval $(call gb_Package_add_files,sd_opengl,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\ transitions-ogl.xml \ diff --git a/sd/Package_web.mk b/sd/Package_web.mk index 3bb393797906..297373583b6e 100644 --- a/sd/Package_web.mk +++ b/sd/Package_web.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,sd_web,$(SRCDIR)/sd/res)) -$(eval $(call gb_Package_set_outdir,sd_web,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,sd_web,$(INSTROOT))) $(eval $(call gb_Package_add_files,sd_web,$(LIBO_SHARE_FOLDER)/config/webcast,\ webview/common.inc \ diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk index e06aab66f1cc..449252b2024e 100644 --- a/sd/Package_xml.mk +++ b/sd/Package_xml.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml)) -$(eval $(call gb_Package_set_outdir,sd_xml,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,sd_xml,$(INSTROOT))) $(eval $(call gb_Package_add_files,sd_xml,$(LIBO_SHARE_FOLDER)/config/soffice.cfg/simpress,\ effects.xml \ |