1 files changed, 16 insertions, 4 deletions

diff --git a/Makefile.in b/Makefile.in
index 03dd881897c..e951c4f5a71 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -108,6 +108,8 @@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 =
 
+HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / macOS.
@@ -330,6 +332,8 @@ CONFIG_STATUS_FILES_IN = \
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
 
+ELN_DESTDIR = "$(DESTDIR)${libexecdir}/emacs/${version}/${configuration}/"
+
 all: ${SUBDIR} info
 
 .PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 etc-emacsver
@@ -423,11 +427,12 @@ VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate))
 src: Makefile
 ifeq (${ns_self_contained},no)
         $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='$(DESTDIR)${bindir}/' \
-                 LISP_DESTDIR='$(DESTDIR)${lispdir}/' all
+                 ELN_DESTDIR='$(ELN_DESTDIR)' all
 else
         $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' BIN_DESTDIR='${ns_appbindir}/' \
-                 LISP_DESTDIR='$(DESTDIR)${lispdir}/' all
+                 ELN_DESTDIR='$(ELN_DESTDIR)' all
 endif
+
 blessmail: Makefile src
         $(MAKE) -C lib-src maybe-blessmail
 
@@ -466,14 +471,14 @@ $(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/m4/*.m4
 # ==================== Installation ====================
 
 .PHONY: install install-arch-dep install-arch-indep install-etcdoc install-info
-.PHONY: install-man install-etc install-strip install-$(NTDIR)
+.PHONY: install-man install-etc install-strip install-$(NTDIR) install-eln
 .PHONY: uninstall uninstall-$(NTDIR)
 
 ## If we let lib-src do its own installation, that means we
 ## don't have to duplicate the list of utilities to install in
 ## this Makefile as well.
 
-install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) blessmail
+install: all install-arch-indep install-etcdoc install-arch-dep install-$(NTDIR) blessmail install-eln
         @true
 
 ## Ensure that $subdir contains a subdirs.el file.
@@ -757,6 +762,12 @@ install-etc:
           done ; \
         done
 
+### Install native compiled Lisp files.
+install-eln:
+ifeq ($(HAVE_NATIVE_COMP),yes)
+        find eln-cache -type f -exec ${INSTALL_DATA} -D "{}" "$(ELN_DESTDIR){}" \;
+endif
+
 ### Build Emacs and install it, stripping binaries while installing them.
 install-strip:
         $(MAKE) INSTALL_STRIP=-s install
@@ -867,6 +878,7 @@ clean: $(clean_dirs:=_clean)
         [ ! -d test ] || $(MAKE) -C test $@
         -rm -f ./*.tmp etc/*.tmp*
         -rm -rf info-dir.*
+        -rm -rf eln-cache
 
 ### 'bootclean'
 ###      Delete all files that need to be remade for a clean bootstrap.