[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - 2 commits - configure.ac ios/README

[Libreoffice Gerrit user]

 configure.ac |    2 +-
 ios/README   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 89cc5e4e2b4517e7179aecf37bae22800679f252
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 25 12:02:45 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 4 16:12:30 2019 +0100

    Fix a couple of typos
    
    Change-Id: Icfaca47c14ad1c76ed45d2ccb362f5f7405c4ca4
    Reviewed-on: https://gerrit.libreoffice.org/68333
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/ios/README b/ios/README
index dbd802339..e6db4fe0d 100644
--- a/ios/README
+++ b/ios/README
@@ -33,7 +33,7 @@ from step 2. This is what I do:
 make clean && make && tar cf - loleaflet/dist | ssh misan.local 'cd lo/online-ios-device && tar xvf -'
 
 where misan.local is the macOS machine where I build the app, in the
-~lo/online-ios-device folder.
+~/lo/online-ios-device folder.
 
 4) In the online folder form step 2, edit the
 ios/Mobile.xcodeproj/project.pbxproj file in your favourite text
@@ -52,7 +52,7 @@ and
 
 The configure script puts the app name as the CFBundleDisplayName
 property into the ios/Mobile/Info.plist file, and set up some
-symbolic links that point to the LIbreOffice core source and build
+symbolic links that point to the LibreOffice core source and build
 directories (which can be the same, of course).
 
 4) Now you can open the Mobile Xcode project, build it, and run it.
commit 3fe322db2963aa9bdca3b8500d457e168af27ba0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Jan 22 23:49:47 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 4 16:12:15 2019 +0100

    Create the ios/Mobile/Fonts directory even if we won't copy any fonts there
    
    It is referenced unconditionally in the Xcode project file.
    
    Change-Id: I1f6713b5327740f76e90ea88dfb19a4933d0bce3
    Reviewed-on: https://gerrit.libreoffice.org/68332
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/configure.ac b/configure.ac
index 37186b182..111f54e92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -628,9 +628,9 @@ AS_IF([test "$ENABLE_IOSAPP" = "true"],
       [
        if test `uname -s` = "Darwin"; then
           IOSAPP_FONTS=''
+          mkdir -p ios/Mobile/Fonts
           if test "$with_iosapp_fonts" != no -a -d "$with_iosapp_fonts"; then
               AC_MSG_NOTICE([copying fonts to be bundled])
-              mkdir -p ios/Mobile/Fonts
               IOSAPP_FONTS=`find "$with_iosapp_fonts" -type f |
                             while read fname; do
                                cp "$fname" ios/Mobile/Fonts