diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-21 01:38:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-21 19:23:44 +0200 |
| commit | 4b5797de8f0f3ae94f174b04398dc2757b297df9 (patch) | |
| tree | 5cd5da57c6ef4d633b9ab993e242f083bd564b3c | |
| parent | 02440d370ddccd447a43d407c7ea0fe49d7ef3ed (diff) | |
pyuno: rename the python wrapper executable
Putting it in a subdirectory on solver is no longer necessary since
python3 started delivering to INSTDIR, so lose the crazy naming.
Change-Id: I17e924e5d872768a64f6a3112f1294f3def7120e
| -rw-r--r-- | Repository.mk | 2 | ||||
| -rw-r--r-- | pyuno/Executable_python_wrapper.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Repository.mk b/Repository.mk index cb71e155dce8..497d8c8383ad 100644 --- a/Repository.mk +++ b/Repository.mk @@ -100,7 +100,7 @@ $(eval $(call gb_Helper_register_executables,OOO, \ $(if $(filter WNT,$(OS)), \ crashrep_com \ odbcconfig \ - pyuno/python \ + python \ quickstart \ sbase \ scalc \ diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python_wrapper.mk index 39ff28324174..2f96404b7ae2 100644 --- a/pyuno/Executable_python_wrapper.mk +++ b/pyuno/Executable_python_wrapper.mk @@ -7,17 +7,17 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Executable_Executable,pyuno/python)) +$(eval $(call gb_Executable_Executable,python)) -$(eval $(call gb_Executable_add_defs,pyuno/python,\ +$(eval $(call gb_Executable_add_defs,python,\ -DMY_PYVERSION=L\"$(PYTHON_VERSION)\" \ )) -$(eval $(call gb_Executable_use_static_libraries,pyuno/python,\ +$(eval $(call gb_Executable_use_static_libraries,python,\ ooopathutils \ )) -$(eval $(call gb_Executable_add_exception_objects,pyuno/python,\ +$(eval $(call gb_Executable_add_exception_objects,python,\ pyuno/zipcore/python \ )) |