diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-10-04 09:16:24 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-10-04 19:44:15 +0200 |
| commit | afb765ab3cab7b6582d0def543b23603cd076445 (patch) | |
| tree | c394f9eb9cfef5ada5a60d33015f0a7a3d85f0e9 /Makefile.in | |
| parent | 187a0333bf0d1c5dd08ec76c9265e5a6077f8e74 (diff) | |
| download | emacs-afb765ab3cab7b6582d0def543b23603cd076445.tar.gz | |
Make filename hashing compatible with self contained builds (bug#43532)
* Makefile.in (lispdirrel): Add replace template.
(epaths-force): Form correctly 'PATH_REL_LOADSEARCH' into epath.h
* configure.ac (lispdirrel): Define variable (relative path of the
lisp files from the installation directory).
* src/comp.c (Fcomp_el_to_eln_filename): Update algorithm not to
rely on 'PATH_DUMPLOADSEARCH' but on 'PATH_REL_LOADSEARCH'.
* src/epaths.in (PATH_REL_LOADSEARCH): Add macro template.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index 2b47762b7bc..027dca0bd70 100644 --- a/Makefile.in +++ b/Makefile.in @@ -223,6 +223,10 @@ iconsrcdir=$(srcdir)/etc/images/icons # These variables hold the values Emacs will actually use. They are # based on the values of the standard Make variables above. +# Where lisp files are installed in a distributed with Emacs (relative +# path to the installation directory). +lispdirrel=@lispdirrel@ + # Where to install the lisp files distributed with Emacs. # This includes the Emacs version, so that the lisp files for different # versions of Emacs will install themselves in separate directories. @@ -368,6 +372,7 @@ epaths-force: @(gamedir='${gamedir}'; \ sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \ -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "${standardlisppath}";' \ + -e 's;\(#.*PATH_REL_LOADSEARCH\).*$$;\1 "${lispdirrel}";' \ -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "${locallisppath}";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "${buildlisppath}";' \ -e '/^#define PATH_[^ ]*SEARCH /s/\([":]\):*/\1/g' \ |