diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-30 21:28:09 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-31 10:42:24 +0100 |
| commit | fa424af27e8fd00528aea6ae4377184557a3a160 (patch) | |
| tree | 254c07b10d5dada0c1bc77cfb88d4e147dbe9fc0 /odk | |
| parent | 6cf65f96123772565b76898dc6892f692696e673 (diff) | |
readlicense_oo: stop delivering files to OUTDIR
- remove Package_readme, use generated files from WORKDIR via include
path
- Package_license and Package_files deliver to INSTDIR
- split up Package_odk_shared_readme to have extra Package for
generated files
- gb_Extension_LICENSEFILE_DEFAULT points to INSTDIR
Change-Id: I019d3431e30d982e887ae0000c755e0d61f98893
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/Module_odk.mk | 1 | ||||
| -rw-r--r-- | odk/Package_share_readme.mk | 11 | ||||
| -rw-r--r-- | odk/Package_share_readme_generated.mk | 19 |
3 files changed, 27 insertions, 4 deletions
diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 2fe4b61b7bf9..9ddc400e62c3 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -28,6 +28,7 @@ $(eval $(call gb_Module_add_targets,odk,\ Package_settings \ Package_settings_generated \ Package_share_readme \ + Package_share_readme_generated \ PackageSet_odk_headers \ )) diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk index 79d8e17259c6..a73d1e9170ca 100644 --- a/odk/Package_share_readme.mk +++ b/odk/Package_share_readme.mk @@ -7,14 +7,17 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,odk_share_readme,$(OUTDIR)/bin)) +$(eval $(call gb_Package_Package,odk_share_readme,$(SRCDIR))) $(eval $(call gb_Package_set_outdir,odk_share_readme,$(INSTDIR))) $(eval $(call gb_Package_add_files,odk_share_readme,$(SDKDIRNAME)/share/readme,\ - LICENSE.html \ - osl/$(gb_LICENSE) \ - osl/$(call gb_README,en-US) \ + readlicense_oo/html/LICENSE.html \ )) +ifneq ($(OS),WNT) +# the stupid thing is renamed, see Package_files.mk +$(eval $(call gb_Package_add_file,odk_share_readme,$(SDKDIRNAME)/share/readme/LICENSE,readlicense_oo/txt/license.txt)) +endif + # vim: set noet sw=4 ts=4: diff --git a/odk/Package_share_readme_generated.mk b/odk/Package_share_readme_generated.mk new file mode 100644 index 000000000000..c7ae0a8a94d2 --- /dev/null +++ b/odk/Package_share_readme_generated.mk @@ -0,0 +1,19 @@ +# -*- 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,odk_share_readme_generated,$(WORKDIR)/CustomTarget/readlicense_oo)) + +$(eval $(call gb_Package_set_outdir,odk_share_readme_generated,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,odk_share_readme_generated,$(SDKDIRNAME)/share/readme,\ + $(if $(filter WNT,$(OS)),license/license.txt) \ + readme/$(call gb_README,en-US) \ +)) + +# vim: set noet sw=4 ts=4: |