diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-22 17:13:13 +0200 |
|---|---|---|
| committer | Khaled Hosny <khaledhosny@eglug.org> | 2017-03-01 18:59:04 +0000 |
| commit | 578c0236017833641d645a47dbaa7ae0e61e3a2d (patch) | |
| tree | 2f3a14cf8266d797b1f12ded7af86332f6d335a2 | |
| parent | a5104f575a5acf8aea957cb79aa0fd67bc74f141 (diff) | |
Put also the LICENSE file in Resources on macOS
Follow-up: Fix gb_Extension_LICENSEFILE_DEFAULT.
Change-Id: Ia4888050099e74b93af67c58e988b4ae9e2516a1
(cherry picked from commit 3c946d688627ba0c31bcb37dfed4e6e180608854)
(cherry picked from commit c0c3575f7434712d294ccb0eaa7f49bf845437e0)
Reviewed-on: https://gerrit.libreoffice.org/34758
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
| -rw-r--r-- | readlicense_oo/Package_files.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk index 1f06bddea33c..0570a79ee82f 100644 --- a/readlicense_oo/Package_files.mk +++ b/readlicense_oo/Package_files.mk @@ -12,7 +12,11 @@ $(eval $(call gb_Package_Package,readlicense_oo_files,$(SRCDIR)/readlicense_oo/l # LICENSE (upper case) is copied without EOL conversion # license.txt is converted, prior to copy, see Package_license.mk ifneq ($(OS),WNT) +ifneq ($(OS),MACOSX) $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE)) +else +$(eval $(call gb_Package_add_file,readlicense_oo_files,Resources/LICENSE,LICENSE)) +endif endif ifneq ($(OS),MACOSX) diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 9bf18c363978..626f399a42c8 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -334,7 +334,7 @@ gb_CliAssemblyTarget_get_dll := # Extension class -gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/LICENSE +gb_Extension_LICENSEFILE_DEFAULT := $(INSTROOT)/Resources/LICENSE # UnpackedTarget class |