diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 19:30:11 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-28 20:17:26 +0100 |
| commit | 8df17a34095dce7db16d9d2e505043f806704f66 (patch) | |
| tree | 80695a18d5364344e1ac1ee376200a96fe569268 /pyuno | |
| parent | 176782e3030d17a05dc7addf4f23bb465995a1db (diff) | |
gbuild: set Package default target to INSTDIR
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/Package_python_scripts.mk | 2 | ||||
| -rw-r--r-- | pyuno/Package_python_shell.mk | 2 | ||||
| -rw-r--r-- | pyuno/Package_zipcore.mk | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index 0a76e0249e92..80af45922d43 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source)) -$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTROOT))) - $(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\ loader/pythonloader.py \ module/uno.py \ diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk index 3f148417c231..e8c3fa6919e4 100644 --- a/pyuno/Package_python_shell.mk +++ b/pyuno/Package_python_shell.mk @@ -9,8 +9,6 @@ $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell))) -$(eval $(call gb_Package_set_outdir,python_shell,$(INSTROOT))) - $(eval $(call gb_Package_add_file,python_shell,$(LIBO_BIN_FOLDER)/python,python.sh)) # vim: set noet sw=4 ts=4: diff --git a/pyuno/Package_zipcore.mk b/pyuno/Package_zipcore.mk index ad14792579e4..c3302910165c 100644 --- a/pyuno/Package_zipcore.mk +++ b/pyuno/Package_zipcore.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Package_Package,python_zipcore,$(call gb_CustomTarget_get_workdir,pyuno/zipcore))) +$(error FIXME do not deliver this stuff to OUTDIR) + pyuno_PYTHON_ARCHIVE_NAME:=python-core-$(PYTHON_VERSION).zip $(eval $(call gb_Package_add_file,python_zipcore,bin/$(pyuno_PYTHON_ARCHIVE_NAME),$(pyuno_PYTHON_ARCHIVE_NAME))) |