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 /postprocess | |
| 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 '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 8e892a12461e..d44a41ebe390 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 $< $(gb_INSTROOT)/$(gb_UIConfig_INSTDIR) $@) + $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTROOT)/$(gb_UIConfig_INSTDIR) $@) # vim: set noet sw=4 ts=4: diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk index f550af3e7a62..5a7c582bf36b 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,postprocess_images,$(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 5f8ed00cdee7..ba1d51605489 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,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,postprocess_registry_install,$(INSTROOT))) $(eval $(call gb_Package_add_files,postprocess_registry_install,$(LIBO_SHARE_FOLDER)/registry,\ $(postprocess_XCDS) \ |