[Libreoffice-commits] core.git: android/experimental

[Tor Lillqvist]

 android/experimental/DocumentLoader/Makefile      |    6 ++----
 android/experimental/LibreOffice4Android/Makefile |    6 ++----
 android/experimental/desktop/Makefile             |    6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

New commits:
commit e30a34f7d7aa3bee338e2cb0323fa153de12f098
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 3 07:36:37 2013 +0300

    Fix up Android app makefiles
    
    Change-Id: I885c2bf3dd04b18850d983ab34199074bd41c175

diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 8410fb3..034b14f 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 1149499..fee5198 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 98b2f23..a42b716 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