android/experimental/DocumentLoader/Makefile | 2 +-
android/experimental/LibreOffice4Android/Makefile | 2 +-
android/experimental/desktop/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1c0e3ea7a0f02251b6a1876ba2eec7ed5cd83246
Author: David Tardon <dtar...@redhat.com>
Date: Sun Apr 14 15:00:05 2013 +0200
fix android build
Change-Id: I97903559e1f6ef48476a74a674c0832d9cb44640
diff --git a/android/experimental/DocumentLoader/Makefile
b/android/experimental/DocumentLoader/Makefile
index 9336ba5..123042f 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -102,7 +102,7 @@ copy-stuff:
# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
# set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
- for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf
$(OUTDIR)/pck/opens___.ttf; do \
+ for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf
$(INSTDIR)/share/fonts/truetype/Gen*.ttf
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
done
#
diff --git a/android/experimental/LibreOffice4Android/Makefile
b/android/experimental/LibreOffice4Android/Makefile
index 4e63b69..598cc6a 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -100,7 +100,7 @@ copy-stuff:
# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
# set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
- for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf
$(OUTDIR)/pck/opens___.ttf; do \
+ for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf
$(INSTDIR)/share/fonts/truetype/Gen*.ttf
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
done
#
diff --git a/android/experimental/desktop/Makefile
b/android/experimental/desktop/Makefile
index f63abc0..86935f3 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -103,7 +103,7 @@ copy-stuff:
# vcl/generic/fontmanager/helper.cxx: psp::getFontPath(). UserInstallation is
# set to the app's data dir above.
mkdir -p assets/gz.unpack/user/fonts
- for F in $(OUTDIR)/pck/Liberation*.ttf $(OUTDIR)/pck/Gen*.ttf
$(OUTDIR)/pck/opens___.ttf; do \
+ for F in $(INSTDIR)/share/fonts/truetype/Liberation*.ttf
$(INSTDIR)/share/fonts/truetype/Gen*.ttf
$(INSTDIR)/share/fonts/truetype/opens___.ttf; do \
gzip -9 <$$F >assets/gz.unpack/user/fonts/`basename $$F`; \
done
#
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
