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

11 files changed, 11 insertions, 11 deletions

diff --git a/wizards/Package_depot.mk b/wizards/Package_depot.mk
index 6080e6311438..081df3c67b10 100644
--- a/wizards/Package_depot.mk
+++ b/wizards/Package_depot.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvdepot,$(SRCDIR)/wizards/source/depot))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvdepot,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvdepot,$(LIBO_SHARE_FOLDER)/basic/Depot,\
 	CommonLang.xba \
diff --git a/wizards/Package_euro.mk b/wizards/Package_euro.mk
index 0f80d8eea422..c3de389b97f4 100644
--- a/wizards/Package_euro.mk
+++ b/wizards/Package_euro.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrveuro,$(SRCDIR)/wizards/source/euro))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrveuro,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrveuro,$(LIBO_SHARE_FOLDER)/basic/Euro,\
 	AutoPilotRun.xba \
diff --git a/wizards/Package_form.mk b/wizards/Package_form.mk
index 54c47a0c4a56..0a1f40dc4fe6 100644
--- a/wizards/Package_form.mk
+++ b/wizards/Package_form.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvform,$(SRCDIR)/wizards/source/formwizard))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvform,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvform,$(LIBO_SHARE_FOLDER)/basic/FormWizard,\
 	DBMeta.xba \
diff --git a/wizards/Package_gimmicks.mk b/wizards/Package_gimmicks.mk
index 1844845d5259..a3aab6986355 100644
--- a/wizards/Package_gimmicks.mk
+++ b/wizards/Package_gimmicks.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvgimmicks,$(SRCDIR)/wizards/source/gimmicks))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvgimmicks,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvgimmicks,$(LIBO_SHARE_FOLDER)/basic/Gimmicks,\
 	AutoText.xba \
diff --git a/wizards/Package_import.mk b/wizards/Package_import.mk
index f2d187ec8eda..44743de2e144 100644
--- a/wizards/Package_import.mk
+++ b/wizards/Package_import.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvimport,$(SRCDIR)/wizards/source/importwizard))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvimport,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvimport,$(LIBO_SHARE_FOLDER)/basic/ImportWizard,\
 	API.xba \
diff --git a/wizards/Package_share.mk b/wizards/Package_share.mk
index ed9a863224de..4c60107f20c4 100644
--- a/wizards/Package_share.mk
+++ b/wizards/Package_share.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicshare,$(SRCDIR)/wizards/source/configshare))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicshare,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicshare,$(LIBO_SHARE_FOLDER)/basic,\
 	dialog.xlc \
diff --git a/wizards/Package_standard.mk b/wizards/Package_standard.mk
index 294ca32ec3a6..ac7d9ee8da75 100644
--- a/wizards/Package_standard.mk
+++ b/wizards/Package_standard.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvstandard,$(SRCDIR)/wizards/source/standard))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvstandard,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvstandard,$(LIBO_SHARE_PRESETS_FOLDER)/basic/Standard,\
 	dialog.xlb \
diff --git a/wizards/Package_template.mk b/wizards/Package_template.mk
index 1d9225e84225..cc07dc80a9fe 100644
--- a/wizards/Package_template.mk
+++ b/wizards/Package_template.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvtemplate,$(SRCDIR)/wizards/source/template))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtemplate,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvtemplate,$(LIBO_SHARE_FOLDER)/basic/Template,\
 	Autotext.xba \
diff --git a/wizards/Package_tools.mk b/wizards/Package_tools.mk
index 309468b991a3..ef0a0aa3d3d5 100644
--- a/wizards/Package_tools.mk
+++ b/wizards/Package_tools.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvtools,$(SRCDIR)/wizards/source/tools))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtools,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvtools,$(LIBO_SHARE_FOLDER)/basic/Tools,\
 	Debug.xba \
diff --git a/wizards/Package_tutorials.mk b/wizards/Package_tutorials.mk
index fb553c4f7a5b..8520f5d09575 100644
--- a/wizards/Package_tutorials.mk
+++ b/wizards/Package_tutorials.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicsrvtutorials,$(SRCDIR)/wizards/source/tutorials))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicsrvtutorials,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicsrvtutorials,$(LIBO_SHARE_FOLDER)/basic/Tutorials,\
 	dialog.xlb \
diff --git a/wizards/Package_usr.mk b/wizards/Package_usr.mk
index 08c3ee69b890..a826784ee3d8 100644
--- a/wizards/Package_usr.mk
+++ b/wizards/Package_usr.mk
@@ -19,7 +19,7 @@
 
 $(eval $(call gb_Package_Package,wizards_basicusr,$(SRCDIR)/wizards/source/config))
 
-$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,wizards_basicusr,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,wizards_basicusr,$(LIBO_SHARE_PRESETS_FOLDER)/basic,\
 	dialog.xlc \