diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-10-03 07:36:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-10-03 10:13:39 +0300 |
| commit | e30a34f7d7aa3bee338e2cb0323fa153de12f098 (patch) | |
| tree | 426885b5845a9d91d62ea313a18bdae037e258b6 /android/experimental | |
| parent | 78f05c0a6514ca084051f16498513033dacb14aa (diff) | |
Fix up Android app makefiles
Change-Id: I885c2bf3dd04b18850d983ab34199074bd41c175
Diffstat (limited to 'android/experimental')
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 6 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 6 | ||||
| -rw-r--r-- | android/experimental/desktop/Makefile | 6 |
3 files changed, 6 insertions, 12 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 8410fb3c9e96..034b14fe07bb 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -38,11 +38,9 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config - cp -R $(OUTDIR)/xml/*.xcd assets/share/registry - mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res + cp -R $(INSTDIR)/share/registry assets/share + mkdir -p assets/share/config cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config - cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app # doesn't use soffice_main() (at least I think it shouldn't), the diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 1149499b1f08..fee51980916c 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -38,11 +38,9 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config - cp -R $(OUTDIR)/xml/*.xcd assets/share/registry - mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res + cp -R $(INSTDIR)/share/registry assets/share + mkdir -p assets/share/config cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config - cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app # doesn't use soffice_main() (at least I think it shouldn't), the diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index 98b2f23d99de..a42b716b27dd 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -39,11 +39,9 @@ copy-stuff: assets cp $(WORKDIR)/ComponentTarget/i18npool/util/i18npool.component assets/ComponentTarget/i18npool/util # - mkdir -p assets/ure/share/misc assets/share/registry/res assets/share/config - cp -R $(OUTDIR)/xml/*.xcd assets/share/registry - mv assets/share/registry/fcfg_langpack_en-US.xcd assets/share/registry/res + cp -R $(INSTDIR)/share/registry assets/share + mkdir -p assets/share/config cp -R $(INSTDIR)/share/config/soffice.cfg assets/share/config - cp -R $(OUTDIR)/xml/registry/* assets/share/registry # # Set up rc, the "inifile". See BootstrapMap::getBaseIni(). As this app # doesn't use soffice_main() (at least I think it shouldn't), the |