diff options
| author | Po Lu <luangruo@yahoo.com> | 2023-03-15 16:17:32 +0800 |
|---|---|---|
| committer | Po Lu <luangruo@yahoo.com> | 2023-03-15 16:17:32 +0800 |
| commit | af7f0b6f9b3bab0d672953dfe9df9dc667287434 (patch) | |
| tree | a0706b0aeed50e902760faf05a845d596797836d /cross | |
| parent | 4e05371fd1da6dd0aa5187b8037948094762a749 (diff) | |
| download | emacs-af7f0b6f9b3bab0d672953dfe9df9dc667287434.tar.gz | |
Update Android port
* cross/Makefile.in (lib/gnulib.mk): Edit out
build-aux stuff.
* m4/ndk-build.m4: Also look for cross ranlib.
Diffstat (limited to 'cross')
| -rw-r--r-- | cross/Makefile.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cross/Makefile.in b/cross/Makefile.in index bceb761d769..5976272b253 100644 --- a/cross/Makefile.in +++ b/cross/Makefile.in @@ -96,9 +96,16 @@ lib-src/config.h: $(top_builddir)/src/config.h.android $(AM_V_GEN) cp -f -p $(top_builddir)/src/config.h.android \ lib-src/config.h +# Figure out where build-aux is. +# Then, replace the build-aux directory with its actual location, +# in case MKDIR_P points there. + +relative_buildaux_dir := $(subst /,\/,$(top_srcdir)/build-aux) + lib/gnulib.mk: $(top_builddir)/lib/gnulib.mk.android $(AM_V_GEN) \ sed -e 's/^srcdir =.*$$/srcdir = $(subst /,\/,$(LIB_SRCDIR))/g' \ + -e 's/$(relative_buildaux_dir)/$(subst /,\/,../$(top_builddir))\/build-aux/g' \ < $(top_builddir)/lib/gnulib.mk.android > $@ lib/Makefile: $(top_builddir)/lib/Makefile.android |