[Libreoffice-commits] core.git: sysui/Package_infoplist.mk

[Michael Stahl]

 sysui/Package_infoplist.mk |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e50a5477fa5949716c38f0f0d7f7835f8b02b7c8
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Wed Jul 11 16:07:53 2018 +0200

    sysui: try to fix Mac instsets
    
    7c6ca00e61c42bb7c43cbb7a3203d8bad5c0ed0e broke the Mac build, because
    the files from infoplist Package have double "/" because of the empty
    path in the call to gb_Package_add_files.
    
    Change-Id: I3a72e8de0a8f2256b068a491231aaaa3d3b00b6e

diff --git a/sysui/Package_infoplist.mk b/sysui/Package_infoplist.mk
index 2051da44b8d5..3f224ae4c157 100644
--- a/sysui/Package_infoplist.mk
+++ b/sysui/Package_infoplist.mk
@@ -9,7 +9,10 @@
 
 $(eval $(call gb_Package_Package,infoplist,$(call gb_CustomTarget_get_workdir,sysui/infoplist)))
 
-$(eval $(call gb_Package_add_files,infoplist,,\
+# workaround to avoid gb_Package_add_files with empty directory adding extra '/'
+$(eval $(call gb_Package_set_outdir,infoplist,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,infoplist,$(PRODUCTNAME_WITHOUT_SPACES).app/Contents,\
 	PkgInfo \
 	Info.plist \
 ))