[Libreoffice-commits] core.git: ios/CustomTarget_iOS_setup.mk

[Tor Lillqvist (via logerrit)]

 ios/CustomTarget_iOS_setup.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fd2f43e05bd065ca9f7878ad715bf0f8afa23f3c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Mar 25 19:07:59 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Mar 25 19:07:59 2019 +0200

    Just include all fonts from instdir/share/fonts in the iOS app
    
    That is apparently what we want.
    
    Change-Id: I900c26873de02495cac7918b0c453f4fdcb6c3e6

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 89f8e340f44d..c06a1241853d 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -69,8 +69,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
 	cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
 	cp -R $(INSTDIR)/share/template $(IOSRES)/share
-	mkdir -p $(IOSRES)/share/fonts/truetype
-	cp $(INSTDIR)/share/fonts/truetype/Liberation* $(IOSRES)/share/fonts/truetype
+	mkdir -p $(IOSRES)/share/fonts
+	cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
 	cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
 	# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and versionrc.