diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-11-27 15:32:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-11-27 16:57:19 +0100 |
| commit | 9d921baa17c3ee8d3c7be0cab5980d0f66319891 (patch) | |
| tree | 62f6b0b54e7f1db9a747ffc5a4065a509a0076b8 /RepositoryExternal.mk | |
| parent | 0c8e2ee3b4bf133d59fd956715418196e0922187 (diff) | |
clean up PYTHON related version etc. variables:
- configure defines PYTHON_VERSION, PYTHON_VERSION_MAJOR,
PYTHON_VERSION_MINOR
- remove pyversion.Makefile
Change-Id: I19ac8df18a520ad56bf63ea038dc0769b8249d0b
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 49fb06f34726..e6232b610b53 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1965,16 +1965,16 @@ define gb_LinkTarget__use_python ifeq ($(OS),WNT) $(call gb_LinkTarget_add_libs,$(1),\ - python33.lib \ + python$(PYTHON_VERSION_MAJOR)$(PYTHON_VERSION_MINOR).lib \ ) else ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_libs,$(1),\ - -dylib_file @loader_path/LibreOfficePython.framework/Versions/3.3/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/3.3/LibreOfficePython \ - -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \ + -dylib_file @loader_path/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython:$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO/LibreOfficePython.framework/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/LibreOfficePython \ + -F$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO -framework LibreOfficePython \ ) else $(call gb_LinkTarget_use_libraries,$(1),\ - python3.3m \ + python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ ) endif @@ -1988,8 +1988,8 @@ $(call gb_LinkTarget_set_include,$(1),\ endef $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - python3 \ - python3.3m \ + python$(PYTHON_VERSION_MAJOR) \ + python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m \ )) endif # SYSTEM_PYTHON |