[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - readlicense_oo/Package_license.mk

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Tue Jun 18 04:56:05 UTC 2019


 readlicense_oo/Package_license.mk |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 808908907350b7705dbae870b22f042512a48ff0
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Wed Mar 20 14:36:58 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Tue Jun 18 06:55:22 2019 +0200

    Fix MSI build after commit 7a9f6df7fb83ec23d09cb5744c2c865fa22e7143
    
    Change-Id: Ib659477a2358b14fbacc1638394c783995272eb5
    Reviewed-on: https://gerrit.libreoffice.org/69466
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit bfa7db29bd5077c4c8be6ccd9dfd80f974c1e148)
    Reviewed-on: https://gerrit.libreoffice.org/74239
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/readlicense_oo/Package_license.mk b/readlicense_oo/Package_license.mk
index 473b3e44fbf4..7f1b5bb309c8 100644
--- a/readlicense_oo/Package_license.mk
+++ b/readlicense_oo/Package_license.mk
@@ -9,7 +9,9 @@
 
 $(eval $(call gb_Package_Package,readlicense_oo_license,$(call gb_CustomTarget_get_workdir,readlicense_oo/license)))
 
-ifneq ($(OS),WNT)
+ifeq ($(OS),WNT)
+$(eval $(call gb_Package_add_file,readlicense_oo_license,license.txt,license.txt))
+else
 ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_license,LICENSE,LICENSE))
 else


More information about the Libreoffice-commits mailing list