From f204dc1f8f386567b0b6bff0c4e39ce211aac793 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist <tml@iki.fi> Date: Thu, 11 Apr 2013 13:37:54 +0300 Subject: Get soffice.cfg from its new location for Android, too Change-Id: I2d65b51ec9a223994d39dc9433d1290b44422e1d --- android/experimental/DocumentLoader/Makefile | 4 ++-- android/experimental/LibreOffice4Android/Makefile | 4 ++-- android/experimental/desktop/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'android/experimental') diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 9977215cbda0..9336ba5ff4a6 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -39,10 +39,10 @@ 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/soffice.cfg + 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 $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg + 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 diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index 9b1aaa22fc50..4e63b69dfaa2 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -39,10 +39,10 @@ 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/soffice.cfg + 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 $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg + 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 diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile index db3587928ae9..f63abc03591f 100644 --- a/android/experimental/desktop/Makefile +++ b/android/experimental/desktop/Makefile @@ -40,10 +40,10 @@ 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/soffice.cfg + 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 $(OUTDIR)/xml/uiconfig/* assets/share/config/soffice.cfg + 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 -- cgit