[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - ios/CustomTarget_iOS_setup.mk

[Tor Lillqvist (via logerrit)]

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

New commits:
commit b5bf5b62061f44aa8b849acc94818c1a9b61fc94
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 17 13:45:13 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 18 08:46:58 2020 +0200

    Move the "registry" directory to be under "share" on iOS, too
    
    Necessary in order to be more like on other platforms. There is an
    upcoming change in the online repo that hardcodes that. (There was no
    specific reason why we had "registry" directly in the app bundle on
    iOS, just some historical randomness.)
    
    Change-Id: Iafcd54598805cb5adaec09b30d32dc51a3f4554e
    (cherry picked from commit b6e2156cdbecea91ca4a29efc71424c1bc85eebd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94229
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index ec6a2492cb47..b4f9a564364a 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -64,7 +64,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/share/filter
 	cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/share/filter
 	cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/share/filter
-	cp -R $(INSTDIR)/share/registry $(IOSRES)
+	cp -R $(INSTDIR)/share/registry $(IOSRES)/share
 	cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
 	cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
 	cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
@@ -86,8 +86,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
         && echo 'BRAND_INI_DIR=file:://$$APP_DATA_DIR' \
         && echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
         && echo 'BRAND_SHARE_RESOURCE_SUBDIR=$(LIBO_SHARE_RESOURCE_FOLDER)' \
-        && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \
-	        'res:$${BRAND_BASE_DIR}/registry' \
+        && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry ' \
+	        'res:$${BRAND_BASE_DIR}/share/registry' \
 	&& echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \
 	&& echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \
 	        'file://$$APP_DATA_DIR/offapi.rdb' \