summaryrefslogtreecommitdiff
path: root/scripting
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-28 19:30:11 +0100
committerMichael Stahl <mstahl@redhat.com>2013-10-28 20:17:26 +0100
commit8df17a34095dce7db16d9d2e505043f806704f66 (patch)
tree80695a18d5364344e1ac1ee376200a96fe569268 /scripting
parent176782e3030d17a05dc7addf4f23bb465995a1db (diff)
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'scripting')
-rw-r--r--scripting/Package_ScriptsBeanShell.mk2
-rw-r--r--scripting/Package_ScriptsJavaScript.mk2
-rw-r--r--scripting/Package_ScriptsPython.mk2
-rw-r--r--scripting/Package_java.mk2
-rw-r--r--scripting/Package_java_jars.mk2
-rw-r--r--scripting/Package_scriptbindinglib.mk2
-rw-r--r--scripting/Package_scriptproviderforpython.mk2
7 files changed, 0 insertions, 14 deletions
diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk
index b495566f9b1a..96e9701b46d1 100644
--- a/scripting/Package_ScriptsBeanShell.mk
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scripting_ScriptsBeanShell,$(SRCDIR)/scripting/examples))
-$(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 \
beanshell/Capitalise/parcel-descriptor.xml \
diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk
index 241f220cf825..161efc519c51 100644
--- a/scripting/Package_ScriptsJavaScript.mk
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scripting_ScriptsJavaScript,$(SRCDIR)/scripting/examples))
-$(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 \
javascript/ExportSheetsToHTML/parcel-descriptor.xml \
diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index b48c08d6a325..41027b04fd73 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/examples))
-$(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 \
python/HelloWorld.py \
diff --git a/scripting/Package_java.mk b/scripting/Package_java.mk
index 1ecd5d6fbc18..bbaa6e2b77b0 100644
--- a/scripting/Package_java.mk
+++ b/scripting/Package_java.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scripting_java,$(SRCDIR)/scripting/examples/java))
-$(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 \
HelloWorld/parcel-descriptor.xml \
diff --git a/scripting/Package_java_jars.mk b/scripting/Package_java_jars.mk
index 9d2670b7e3f6..13ba07e8c608 100644
--- a/scripting/Package_java_jars.mk
+++ b/scripting/Package_java_jars.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scripting_java_jars,$(WORKDIR)/Jar))
-$(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))
$(eval $(call gb_Package_add_file,scripting_java_jars,$(LIBO_SHARE_FOLDER)/Scripts/java/MemoryUsage/MemoryUsage.jar,MemoryUsage.jar))
diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk
index 0d5f278f275f..84ae6c266caa 100644
--- a/scripting/Package_scriptbindinglib.mk
+++ b/scripting/Package_scriptbindinglib.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scripting_scriptbindinglib,$(SRCDIR)/scripting/workben/bindings))
-$(eval $(call gb_Package_set_outdir,scripting_scriptbindinglib,$(INSTROOT)))
-
$(eval $(call gb_Package_add_files,scripting_scriptbindinglib,$(LIBO_SHARE_FOLDER)/basic/ScriptBindingLibrary,\
Highlight.xdl \
dialog.xlb \
diff --git a/scripting/Package_scriptproviderforpython.mk b/scripting/Package_scriptproviderforpython.mk
index b946bcbb6648..f16758707ee7 100644
--- a/scripting/Package_scriptproviderforpython.mk
+++ b/scripting/Package_scriptproviderforpython.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Package_Package,scriptproviderforpython,$(SRCDIR)/scripting/source/pyprov))
-$(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))