[Libreoffice-commits] core.git: odk/Package_share_readme.mk readlicense_oo/CustomTarget_license.mk readlicense_oo/Package_license.mk

[Andras Timar (via logerrit)]

 odk/Package_share_readme.mk            |    2 +-
 readlicense_oo/CustomTarget_license.mk |    4 ++--
 readlicense_oo/Package_license.mk      |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 2c53846e8861c2252b712e5733936b83f66c4816
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Apr 1 21:20:50 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Apr 1 23:09:58 2019 +0200

    (blind) fix of 'ERROR: Source for LICENSE.html not found!' on macOS
    
    Change-Id: I0f87d96691281e773b48ab11380c0dfa3a65ebba
    Reviewed-on: https://gerrit.libreoffice.org/70083
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/odk/Package_share_readme.mk b/odk/Package_share_readme.mk
index 8a40075c5044..6f0a960b8ad2 100644
--- a/odk/Package_share_readme.mk
+++ b/odk/Package_share_readme.mk
@@ -13,7 +13,7 @@ $(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,\
-	license.html \
+	LICENSE.html \
 ))
 
 # for WNT see Package_share_readme_generated.mk
diff --git a/readlicense_oo/CustomTarget_license.mk b/readlicense_oo/CustomTarget_license.mk
index 75923d109970..15d4a31ea694 100644
--- a/readlicense_oo/CustomTarget_license.mk
+++ b/readlicense_oo/CustomTarget_license.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,readlicense_oo/license))
 readlicense_oo_DIR := $(call gb_CustomTarget_get_workdir,readlicense_oo/license)
 readlicense_oo_LICENSE_xml := $(SRCDIR)/readlicense_oo/license/license.xml
 
-$(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/license.html
+$(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/LICENSE.html
 
 ifeq ($(OS),WNT)
 $(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/license.txt
@@ -20,7 +20,7 @@ else
 $(call gb_CustomTarget_get_target,readlicense_oo/license) : $(readlicense_oo_DIR)/LICENSE
 endif
 
-$(readlicense_oo_DIR)/license.html : \
+$(readlicense_oo_DIR)/LICENSE.html : \
 		$(SRCDIR)/readlicense_oo/license/license_html.xsl \
 		$(readlicense_oo_LICENSE_xml) \
 		| $(readlicense_oo_DIR)/.dir \
diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index 7f1b5bb309c8..67755904a007 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -20,9 +20,9 @@ endif
 endif
 
 ifneq ($(OS),MACOSX)
-$(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE.html,license.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE.html,LICENSE.html))
 else
-$(eval $(call gb_Package_add_file,readlicense_oo_license,Resources/LICENSE.html,license.html))
+$(eval $(call gb_Package_add_file,readlicense_oo_license,Resources/LICENSE.html,LICENSE.html))
 endif
 
 # vim: set noet sw=4 ts=4: