Fix doc file generation on Android

* .gitignore: Ignore cross/etc/DOC.
* configure.ac: Make the directory `cross/etc'.
* cross/Makefile.in (CLEAN_SUBDIRS): Clean files inside `etc' as
well.
* java/Makefile.in (install_temp): Copy cross/etc/DOC to the
package if it is available.
* src/Makefile.in (SOME_MACHINE_OBJECTS): Add androidselect.c,
sfntfont-android.c and sfntfont.c.
(libemacs.so): Depend on $(etc)/DOC.

1 files changed, 5 insertions, 0 deletions

diff --git a/java/Makefile.in b/java/Makefile.in
index 84173cd9655..d11278e6110 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -191,6 +191,11 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES)
         $(AM_V_SILENT) cp -r $(top_srcdir)/lisp install_temp/assets
         $(AM_V_SILENT) cp -r $(top_srcdir)/etc install_temp/assets
         $(AM_V_SILENT) cp -r $(top_srcdir)/info install_temp/assets
+# Replace etc/DOC generated by compiling Emacs for the build machine
+# with etc/DOC from the cross-compiled Emacs.
+        $(AM_V_SILENT) test -f $(top_builddir)/cross/etc/DOC    \
+          && cp -r $(top_builddir)/cross/etc/DOC                \
+             install_temp/assets/etc
 # Remove undesirable files from those directories.
         $(AM_V_SILENT)                                          \
         for subdir in `find install_temp -type d -print`; do    \