diff options
author | Tor Lillqvist <tml@collabora.com> | 2013-09-12 14:21:39 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2013-09-12 14:25:34 +0300 |
commit | 854c302ed254f2b439cd90c60ff6635111f449f1 (patch) | |
tree | 1196bec6e3cc24fd1bf33c1c5bf2511dded8027b /ios | |
parent | d1dad0cf5382244dfe940d21a9af4df980c8ecc7 (diff) |
Adapt to OUTDIR->INSTDIR changes
Change-Id: I21c44470fa49152ebff79bf5138b32f07da53328
Diffstat (limited to 'ios')
-rw-r--r-- | ios/CustomTarget_LibreOffice_app.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk index fbc385da7402..b8a55be629b3 100644 --- a/ios/CustomTarget_LibreOffice_app.mk +++ b/ios/CustomTarget_LibreOffice_app.mk @@ -56,8 +56,8 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) cp $(OUTDIR)/bin/offapi.rdb $(appdir) cp $(OUTDIR)/bin/udkapi.rdb $(appdir) cp $(OUTDIR)/bin/oovbaapi.rdb $(appdir) - cp $(OUTDIR)/xml/services.rdb $(appdir) - cp $(OUTDIR)/xml/ure/services.rdb $(appdir)/ure + cp $(INSTDIR)/program/services/services.rdb $(appdir) + cp $(INSTDIR)/ure/share/misc/services.rdb $(appdir)/ure # # Copy "registry" files # @@ -72,12 +72,12 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice) # we could set STAR_RESOURCE_PATH instead. sigh... # mkdir -p $(appdir)/program/resource - cp $(OUTDIR)/bin/*en-US.res $(appdir)/program/resource + cp $(INSTDIR)/$(LIBO_SHARE_RESOURCE_FOLDER)/*en-US.res $(appdir)/program/resource # # Artwork # mkdir -p $(appdir)/share/config - cp -R $(OUTDIR)/bin/images_tango.zip $(appdir)/share/config/images.zip + cp -R $(INSTDIR)/$(LIBO_SHARE_FOLDER)/config/images_tango.zip $(appdir)/share/config/images.zip # # soffice.cfg # |