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

10 files changed, 10 insertions, 10 deletions

diff --git a/more_fonts/ExternalPackage_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index 447c72c9ba88..d307041af5db 100644
--- a/more_fonts/ExternalPackage_dejavu.mk
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_dejavu,font_dejavu))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_dejavu,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_dejavu,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	ttf/DejaVuSans-Bold.ttf \
diff --git a/more_fonts/ExternalPackage_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
index 4b0138acf409..2099d66f82f0 100644
--- a/more_fonts/ExternalPackage_gentium.mk
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_gentium,font_gentium))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_gentium,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_gentium,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	GenBasB.ttf \
diff --git a/more_fonts/ExternalPackage_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index 76fd346e2300..b3a43c879aac 100644
--- a/more_fonts/ExternalPackage_liberation.mk
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation,font_liberation))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	LiberationMono-Bold.ttf \
diff --git a/more_fonts/ExternalPackage_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
index e72fa4e43725..93af73aae165 100644
--- a/more_fonts/ExternalPackage_liberation_narrow.mk
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_liberation_narrow,font_liberation_narrow))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_liberation_narrow,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_liberation_narrow,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	LiberationSansNarrow-Bold.ttf \
diff --git a/more_fonts/ExternalPackage_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
index 279a87f1f0d6..4e08aa2bc42d 100644
--- a/more_fonts/ExternalPackage_libertineg.mk
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_libertineg,font_libertineg))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_libertineg,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_libertineg,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	LinBiolinum_RB_G.ttf \
diff --git a/more_fonts/ExternalPackage_opensans.mk b/more_fonts/ExternalPackage_opensans.mk
index d0c4636b016a..53be59399312 100644
--- a/more_fonts/ExternalPackage_opensans.mk
+++ b/more_fonts/ExternalPackage_opensans.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_opensans,font_opensans))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_opensans,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_opensans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	OpenSans-BoldItalic.ttf \
diff --git a/more_fonts/ExternalPackage_ptserif.mk b/more_fonts/ExternalPackage_ptserif.mk
index 2c868f5a2b0c..c9f0c988320d 100644
--- a/more_fonts/ExternalPackage_ptserif.mk
+++ b/more_fonts/ExternalPackage_ptserif.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_ptserif,font_ptserif))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_ptserif,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_ptserif,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	PT_Serif-Web-BoldItalic.ttf \
diff --git a/more_fonts/ExternalPackage_sourcecode.mk b/more_fonts/ExternalPackage_sourcecode.mk
index 8cf75d658f17..416d44e1016d 100644
--- a/more_fonts/ExternalPackage_sourcecode.mk
+++ b/more_fonts/ExternalPackage_sourcecode.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcecode,font_sourcecode))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcecode,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcecode,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	SourceCodePro-Bold.ttf \
diff --git a/more_fonts/ExternalPackage_sourcesans.mk b/more_fonts/ExternalPackage_sourcesans.mk
index 4d7f769cac2c..bf6d315bf865 100644
--- a/more_fonts/ExternalPackage_sourcesans.mk
+++ b/more_fonts/ExternalPackage_sourcesans.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_ExternalPackage_ExternalPackage,fonts_sourcesans,font_sourcesans))
 
-$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(gb_INSTROOT)))
+$(eval $(call gb_ExternalPackage_set_outdir,fonts_sourcesans,$(INSTROOT)))
 
 $(eval $(call gb_ExternalPackage_add_unpacked_files,fonts_sourcesans,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
 	SourceSansPro-BoldItalic.ttf \
diff --git a/more_fonts/Package_conf.mk b/more_fonts/Package_conf.mk
index a81534c87d50..021a51f4f379 100644
--- a/more_fonts/Package_conf.mk
+++ b/more_fonts/Package_conf.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,more_fonts_conf,$(SRCDIR)/more_fonts/fonts))
 
-$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,more_fonts_conf,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_file,more_fonts_conf,$(LIBO_SHARE_FOLDER)/fonts/truetype/fc_local.conf,fc_local.conf))