diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-08 17:19:41 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-08 20:39:10 +0300 |
| commit | d7094ab8b3ef199573b4a846cf4eff880b4870aa (patch) | |
| tree | 43242ea068eb524018a845a1c7ed998b0fa91369 /ios | |
| parent | 26303d1f95d2b12b9e0df68a953ab19f5378d944 (diff) | |
Adapt to instdir and solver changes lately
Change-Id: Idc6c20f6645f2e39b98a11f741aaa482f31c6ea1
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_LibreOffice_app.mk | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index 6fedb74f31ec..9ba7decfb496 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -59,14 +59,6 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) cp $(INSTDIR)/program/services/services.rdb $(appdir) cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure # -# Copy "registry" files -# -# FIXME This can be removed ? registry is copied below - mkdir -p $(appdir)/registry/modules $(appdir)/registry/res - cp $(OUTDIR)/xml/*.xcd $(appdir)/registry - mv $(appdir)/registry/fcfg_langpack_en-US.xcd $(appdir)/registry/res - cp -R $(OUTDIR)/xml/registry/* $(appdir)/registry -# # Copy .res files # # program/resource is hardcoded in tools/source/rc/resmgr.cxx. Sure, @@ -103,7 +95,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) ( \ echo '[Bootstrap]' && \ echo 'BRAND_BASE_DIR=file://$$APP_DATA_DIR' && \ - echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/registry module:$${BRAND_BASE_DIR}/registry/modules res:$${BRAND_BASE_DIR}/registry' && \ + echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' && \ : ) > $(appdir)/fundamentalrc # ( \ |