diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-04 14:59:45 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-04 14:43:03 +0000 |
| commit | 6cac17078c46df312ef145d1c5a136848204c107 (patch) | |
| tree | 7d3e693b823a549f3028e90c42e2f3fcf7efe662 /python3 | |
| parent | eb5056dc2eb1bed5dffeca889810b0a5d5246b11 (diff) | |
install python framework using filelist
Change-Id: Ib3a98d8268d0a1973d5f06b993c293fd41ba47e1
Reviewed-on: https://gerrit.libreoffice.org/3779
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/GeneratedPackage_python3.mk | 18 | ||||
| -rw-r--r-- | python3/Module_python3.mk | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk new file mode 100644 index 000000000000..91e62bd42807 --- /dev/null +++ b/python3/GeneratedPackage_python3.mk @@ -0,0 +1,18 @@ +# -*- 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_GeneratedPackage_GeneratedPackage,python3,$(call gb_UnpackedTarball_get_dir,python3)/python-inst/@__________________________________________________OOO)) + +$(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) + +$(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) + +$(eval $(call gb_GeneratedPackage_add_dir,python3,program/LibreOfficePython.framework,LibreOfficePython.framework)) + +# vim: set noet sw=4 ts=4: diff --git a/python3/Module_python3.mk b/python3/Module_python3.mk index 831f79e4a16e..eb2ec39ecb0b 100644 --- a/python3/Module_python3.mk +++ b/python3/Module_python3.mk @@ -15,7 +15,7 @@ ifeq ($(SYSTEM_PYTHON),NO) $(eval $(call gb_Module_add_targets,python3,\ UnpackedTarball_python3 \ ExternalProject_python3 \ - $(if $(filter MACOSX,$(OS)),Zip_PythonFramework,ExternalPackage_python3) \ + $(if $(filter MACOSX,$(OS)),GeneratedPackage_python3,ExternalPackage_python3) \ )) endif |