diff options
| author | Tamas Bunth <tamas.bunth@collabora.co.uk> | 2019-03-04 16:54:06 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-06-15 22:57:28 +0200 |
| commit | 3edc4c1a4a3d740988f4fd303ac4820eed01206b (patch) | |
| tree | 9be1af73a8108e7539a3b2938f54e709d11b3b00 /odk | |
| parent | Fix MPLv2 subset packaging (diff) | |
| download | core-3edc4c1a4a3d740988f4fd303ac4820eed01206b.tar.gz core-3edc4c1a4a3d740988f4fd303ac4820eed01206b.zip | |
single source file for licensing info with conditional text
... for easier maintenance. This commit only introduces the
framework. Follow up commits will update the license file.
Advantages:
* single source, multiple outputs (html, txt)
* conditional text, i.e. output will not include license
terms of components that are not configured in the build
Change-Id: I0ffad41119228a0a26fd1b6ce19930ca6085adb2
Reviewed-on: https://gerrit.libreoffice.org/69396
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/Package_share_readme.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk index 558bdd5cb84d..8a40075c5044 100644 --- a/odk/Package_share_readme.mk +++ b/odk/Package_share_readme.mk @@ -7,17 +7,19 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,odk_share_readme,$(SRCDIR))) +readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license) +$(eval $(call gb_Package_Package,odk_share_readme,$(readlicense_oo_DIR))) $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR))) $(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\ - readlicense_oo/license/LICENSE.html \ + license.html \ )) # for WNT see Package_share_readme_generated.mk ifneq ($(OS),WNT) -$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/license/LICENSE)) +readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license) +$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,LICENSE)) endif # vim: set noet sw=4 ts=4: |