Further work on the "Mac-like app structure" option

Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.

Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4

7 files changed, 10 insertions, 10 deletions

diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk
index 88315df303b6..44b664126cbb 100644
--- a/scripting/Package_ScriptsBeanShell.mk
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/
 
 $(eval $(call gb_Package_set_outdir,scripting_ScriptsBeanShell,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,share/Scripts,\
+$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsBeanShell,$(LIBO_SHARE_FOLDER)/Scripts,\
 	beanshell/Capitalise/capitalise.bsh \
 	beanshell/Capitalise/parcel-descriptor.xml \
 	beanshell/HelloWorld/helloworld.bsh \
diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk
index 3103c511bfa1..8780778d1407 100644
--- a/scripting/Package_ScriptsJavaScript.mk
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting
 
 $(eval $(call gb_Package_set_outdir,scripting_ScriptsJavaScript,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,share/Scripts,\
+$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsJavaScript,$(LIBO_SHARE_FOLDER)/Scripts,\
 	javascript/ExportSheetsToHTML/exportsheetstohtml.js \
 	javascript/ExportSheetsToHTML/parcel-descriptor.xml \
 	javascript/HelloWorld/helloworld.js \
diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index d88d810b0c86..aa9985b035eb 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/exa
 
 $(eval $(call gb_Package_set_outdir,scripting_ScriptsPython,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,share/Scripts,\
+$(eval $(call gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\
 	python/Capitalise.py \
 	python/HelloWorld.py \
 	python/pythonSamples/TableSample.py \
diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk
index a840e2096dbc..7c846c0b37cd 100644
--- a/scripting/Package_java.mk
+++ b/scripting/Package_java.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/jav
 
 $(eval $(call gb_Package_set_outdir,scripting_java,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files_with_dir,scripting_java,share/Scripts/java,\
+$(eval $(call gb_Package_add_files_with_dir,scripting_java,$(LIBO_SHARE_FOLDER)/Scripts/java,\
     HelloWorld/HelloWorld.java \
     HelloWorld/parcel-descriptor.xml \
     Highlight/HighlightText.java \
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
index 4e7ba203c00d..eaeee8be91f1 100644
--- a/scripting/Package_java_jars.mk
+++ b/scripting/Package_java_jars.mk
@@ -11,8 +11,8 @@ $(eval $(call gb_Package_Package,scripting_java_jars,$(OUTDIR)/bin))
 
 $(eval $(call gb_Package_set_outdir,scripting_java_jars,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/HelloWorld/HelloWorld.jar,HelloWorld.jar))
-$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/Highlight/Highlight.jar,Highlight.jar))
-$(eval $(call gb_Package_add_file,scripting_java_jars,share/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar))
+$(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))
+$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar))
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk
index 5320d5a8e285..d630058eee5a 100644
--- a/scripting/Package_scriptbindinglib.mk
+++ b/scripting/Package_scriptbindinglib.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/
 
 $(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,share/basic/ScriptBindingLibrary,\
+$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\
 	Highlight.xdl \
 	dialog.xlb \
 	script.xlb \
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index afe0e1232172..cd2e8b6d31fb 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/sou
 
 $(eval $(call gb_Package_set_outdir,scriptproviderforpython,$(INSTDIR)))
 
-$(eval $(call gb_Package_add_file,scriptproviderforpython,$(gb_PROGRAMDIRNAME)/services/scriptproviderforpython.rdb,scriptproviderforpython.rdb))
-$(eval $(call gb_Package_add_file,scriptproviderforpython,$(gb_PROGRAMDIRNAME)/pythonscript.py,pythonscript.py))
+$(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))
 
 # vim: set noet sw=4 ts=4: