[Libreoffice-commits] core.git: 2 commits - android/experimental ios/CustomTarget_LibreOffice_app.mk

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile      |    4 ++--
 android/experimental/LibreOffice4Android/Makefile |    4 ++--
 android/experimental/desktop/Makefile             |    4 ++--
 ios/CustomTarget_LibreOffice_app.mk               |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f204dc1f8f386567b0b6bff0c4e39ce211aac793
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Apr 11 13:37:54 2013 +0300

    Get soffice.cfg from its new location for Android, too
    
    Change-Id: I2d65b51ec9a223994d39dc9433d1290b44422e1d

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 9977215..9336ba5 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 9b1aaa2..4e63b69 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 db35879..f63abc0 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
commit 25c6386a52209c5b00e1310c0b54df1f51d17bb6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Thu Apr 11 13:37:06 2013 +0300

    Typo
    
    Change-Id: I87c74eb6e4f9aa4f06bfca00817b4d04d7d84b40

diff --git a/ios/CustomTarget_LibreOffice_app.mk b/ios/CustomTarget_LibreOffice_app.mk
index da789c8..21a6fac 100644
--- a/ios/CustomTarget_LibreOffice_app.mk
+++ b/ios/CustomTarget_LibreOffice_app.mk
@@ -81,7 +81,7 @@ $(SCRIPT_OUTPUT_FILE_0) : $(call gb_Executable_get_target,LibreOffice)
 #
 # soffice.cfg
 #
-	cp -R $(INSDIR)/share/config/soffice.cfg $(appdir)/share/config
+	cp -R $(INSTDIR)/share/config/soffice.cfg $(appdir)/share/config
 #
 # "registry"
 #