diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-02-17 13:45:13 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-02-17 15:56:02 +0200 |
| commit | 086be3661434a8304a88b846561abf4dda83fb1c (patch) | |
| tree | 296071422677ed16a765f5c92802b334220ce414 | |
| parent | 66708c95afa8ef7f0fcbbe0667405e3e3881c4c9 (diff) | |
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
| -rw-r--r-- | ios/CustomTarget_iOS_setup.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 914a2aacf4b7..66e876337278 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -68,7 +68,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 @@ -90,8 +90,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' \ |