diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-07-11 16:47:13 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-07-11 16:47:13 +0800 |
| commit | fcf53bf9f5894665af07499137d7e8ef888cdcdd (patch) | |
| tree | deeccc2595b3db08caaf703d813cae574e715b9c /java | |
| parent | f2c4643890837c156b8332227232060028102c01 (diff) | |
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.
Diffstat (limited to 'java')
| -rw-r--r-- | java/Makefile.in | 5 |
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 \ |