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

7 files changed, 7 insertions, 7 deletions

diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk
index 8a3daf3b9329..b495566f9b1a 100644
--- a/scripting/Package_ScriptsBeanShell.mk
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples))
 
-$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,$(LIBO_SHARE_FOLDER)/Scripts,\
 	beanshell/Capitalise/capitalise.bsh \
diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk
index 17519cf60b48..241f220cf825 100644
--- a/scripting/Package_ScriptsJavaScript.mk
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples))
 
-$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,$(LIBO_SHARE_FOLDER)/Scripts,\
 	javascript/ExportSheetsToHTML/exportsheetstohtml.js \
diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index 2f284b3627e5..b48c08d6a325 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples))
 
-$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\
 	python/Capitalise.py \
diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk
index 79fb9beab077..1ecd5d6fbc18 100644
--- a/scripting/Package_java.mk
+++ b/scripting/Package_java.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java))
 
-$(eval $(call gb_Package_set_outdir,scripting_java,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_java,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files_with_dir,scripting_java,$(LIBO_SHARE_FOLDER)/Scripts/java,\
     HelloWorld/HelloWorld.java \
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
index 9832a959e1e6..bb2fc38604fa 100644
--- a/scripting/Package_java_jars.mk
+++ b/scripting/Package_java_jars.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin))
 
-$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar))
 $(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/Highlight/Highlight.jar,Highlight.jar))
diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk
index 2ebdc1045669..0d5f278f275f 100644
--- a/scripting/Package_scriptbindinglib.mk
+++ b/scripting/Package_scriptbindinglib.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings))
 
-$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\
 	Highlight.xdl \
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index d92dec47d643..b946bcbb6648 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -9,7 +9,7 @@
 
 $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
 
-$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(gb_INSTROOT)))
+$(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTROOT)))
 
 $(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_ETC_FOLDER)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
 $(eval $(call gb_Package_add_file,scriptproviderforpython,$(LIBO_LIB_PYUNO_FOLDER)/pythonscript.py,pythonscript.py))