From 32fe187bdf16ebc81a09592be0af75dc2227cded Mon Sep 17 00:00:00 2001 From: Po Lu Date: Thu, 24 Aug 2023 12:41:15 +0800 Subject: Install rcs2log within Emacs packages for Android * doc/emacs/android.texi (Android Environment): Mention the `rcs2log' program name variable. Also refine the wording of the paragraph describing bundled programs a bit. * doc/lispref/processes.texi (Subprocess Creation): Mention `rcs2log' and `rcs2log-program-name'. Correct typos and spelling mistakes within the variable index. * etc/NEWS: Amend the announcement of *-program-name to also cite rcs2log. * java/Makefile.in (install_temp): Copy rcs2log to lib/*/librcs2log.so after minor revisions to change the interpreter name. * lisp/vc/vc-rcs.el (vc-rcs-rcs2log-program): Ground the program name upon `rcs2log-program-name'. * src/callproc.c (syms_of_callproc) : New defvar. Define to `librcs2log.so' under Android, `rcs2log' elsewhere. --- java/Makefile.in | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'java') diff --git a/java/Makefile.in b/java/Makefile.in index 804d4669c7a..87683f12544 100644 --- a/java/Makefile.in +++ b/java/Makefile.in @@ -227,6 +227,13 @@ install_temp: $(CROSS_BINS) $(CROSS_LIBS) $(RESOURCE_FILES) cp -f $$file install_temp/lib/$(ANDROID_ABI); \ fi \ done +# Next, produce a version of rcs2log befitting Android's naming +# conventions and shell interpreter location. + $(AM_V_at) \ + sed 's|/bin/sh|/system/bin/sh|' \ + $(top_srcdir)/lib-src/rcs2log > \ + install_temp/lib/$(ANDROID_ABI)/librcs2log.so + $(AM_V_at) chmod +x install_temp/lib/$(ANDROID_ABI)/librcs2log.so ifneq ($(NDK_BUILD_SHARED),) $(AM_V_SILENT) cp -f $(NDK_BUILD_SHARED) \ install_temp/lib/$(ANDROID_ABI) -- cgit v1.2.1