diff options
author | jan Iversen <jani@libreoffice.org> | 2018-03-03 22:36:40 +0100 |
---|---|---|
committer | jan Iversen <jani@libreoffice.org> | 2018-03-03 22:37:18 +0100 |
commit | 652749a32b347a9114acd1d9585d0697a7d8dbc0 (patch) | |
tree | 5d19291ba38fe3b9f59e22d1b614a74bde1d2192 /ios/CustomTarget_iOS_setup.mk | |
parent | 97d03a120911c738fe47172b8798a0068ed2d3db (diff) |
iOS, moved resources from share to direct.
Change-Id: I266fe71a6c58d8b80fa917198e8d84b356dfe296
Diffstat (limited to 'ios/CustomTarget_iOS_setup.mk')
-rw-r--r-- | ios/CustomTarget_iOS_setup.mk | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index 3c7573ae5330..a9f98850c6d8 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -20,8 +20,8 @@ IOSDIRS = $(IOSGEN) \ $(IOSRES)/services \ $(IOSRES)/program \ $(IOSRES)/share \ - $(IOSRES)/share/config \ - $(IOSRES)/share/filter \ + $(IOSRES)/config \ + $(IOSRES)/filter \ $(WORKDIR)/ios @@ -60,12 +60,12 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \ cp $(INSTDIR)/program/types/oovbaapi.rdb $(IOSRES) cp $(INSTDIR)/program/services/services.rdb $(IOSRES)/services cp $(INSTDIR)/program/services.rdb $(IOSRES) - cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/share/config - 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)/share - cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config + cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRES)/config + cp $(INSTDIR)/share/filter/oox-drawingml-adj-names $(IOSRES)/filter + cp $(INSTDIR)/share/filter/oox-drawingml-cs-presets $(IOSRES)/filter + cp $(INSTDIR)/share/filter/vml-shape-types $(IOSRES)/filter + cp -R $(INSTDIR)/share/registry $(IOSRES) + cp $(INSTDIR)/share/config/*zip $(IOSRES)/config cp $(SRCDIR)/ios/welcome.odt $(IOSRES) # Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and versionrc. @@ -79,7 +79,7 @@ $(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}/share/registry ' \ + && echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry ' \ 'res:$${BRAND_BASE_DIR}/registry' \ && echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' \ && echo 'UNO_TYPES=file://$$APP_DATA_DIR/udkapi.rdb ' \ |