diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-17 15:26:52 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:08:59 +0200 |
| commit | 031fd222ac94ab30c8e17f96263934bd5e148dd7 (patch) | |
| tree | 26f78d989b63cc64588852c30aef367098df3e06 /pyuno | |
| parent | 4cb5f23b232ac22369d700f8bfae713e6893449c (diff) | |
pyuno: install python scripts using filelists
Change-Id: Ic7515acd14916cc36b59749059ed623cda906c23
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/Module_pyuno.mk | 6 | ||||
| -rw-r--r-- | pyuno/Package_python_scripts.mk | 16 | ||||
| -rw-r--r-- | pyuno/Package_python_scripts_install.mk | 20 |
3 files changed, 7 insertions, 35 deletions
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk index de42e49f5dfb..8a6667bf6eae 100644 --- a/pyuno/Module_pyuno.mk +++ b/pyuno/Module_pyuno.mk @@ -61,12 +61,6 @@ endif endif # SYSTEM_PYTHON -ifneq ($(gb_RUNNABLE_INSTDIR),) -$(eval $(call gb_Module_add_targets,pyuno,\ - Package_python_scripts_install \ -)) -endif - endif # DISABLE_PYTHON # vim:set noet sw=4 ts=4: diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index 639240a68bb7..9afe7f5739d4 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -7,16 +7,14 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,pyuno_python,$(SRCDIR)/pyuno/source)) +$(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source)) -ifeq ($(OS),WNT) -pyuno_PYTHON_SCRIPT_DIR=bin -else -pyuno_PYTHON_SCRIPT_DIR=lib -endif +$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTDIR))) -$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/unohelper.py,module/unohelper.py)) -$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/uno.py,module/uno.py)) -$(eval $(call gb_Package_add_file,pyuno_python,$(pyuno_PYTHON_SCRIPT_DIR)/pyuno/pythonloader.py,loader/pythonloader.py)) +$(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\ + loader/pythonloader.py \ + module/uno.py \ + module/unohelper.py \ +)) # vim: set noet sw=4 ts=4: diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk deleted file mode 100644 index 6a68a3b6437f..000000000000 --- a/pyuno/Package_python_scripts_install.mk +++ /dev/null @@ -1,20 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_Package_Package,pyuno_python_scripts_install,$(SRCDIR)/pyuno/source)) - -$(eval $(call gb_Package_set_outdir,pyuno_python_scripts_install,$(INSTDIR))) - -$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,$(LIBO_LIB_PYUNO_FOLDER),\ - loader/pythonloader.py \ - module/uno.py \ - module/unohelper.py \ -)) - -# vim: set noet sw=4 ts=4: |