diff options
| author | Dani Moncayo <dmoncayo@gmail.com> | 2014-11-08 16:18:06 +0100 |
|---|---|---|
| committer | Dani Moncayo <dmoncayo@gmail.com> | 2014-11-08 16:18:06 +0100 |
| commit | 1e1f2237cd3bcb66158756c17e6f405a36e12254 (patch) | |
| tree | 3227c42a837580b31e995acea4ac1f2ba8600639 | |
| parent | 7c86a2a7d82558206a96139bab73552003b3c28f (diff) | |
| download | emacs-1e1f2237cd3bcb66158756c17e6f405a36e12254.tar.gz | |
Makefile.in (epaths-force-w32): Simplify.
* Makefile.in (epaths-force-w32): Simplify, assuming that the shell is
bash (as is the case in MSYS).
(msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer used).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 12 |
2 files changed, 7 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index b79cf6d2393..24e883b3cea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,11 @@ * build-aux/msys-to-w32: simplify the initial over-engineered interface, and the implementation. - * Makefile.in (epaths-force-w32): Update for the above. + * Makefile.in (epaths-force-w32): Update for the above. Also + simplify, assuming that the shell is bash (which is the case in + MSYS). + (msys_w32prefix_subst, msys_sed_sh_escape): Remove (no longer + used). 2014-11-05 Glenn Morris <rgm@gnu.org> diff --git a/Makefile.in b/Makefile.in index 5dbe514e22a..aacc168a9a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -323,14 +323,6 @@ epaths-force: -e 's;\(#.*PATH_DOC\).*$$;\1 "${etcdocdir}";') && \ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h -# Replace "${w32prefix}" with '%emacs_dir%' (which expands to install -# directory at runtime). -msys_w32prefix_subst=sed -e 's!\(^\|;\)'"$${w32prefixpattern}"'\([;/]\|$$\)!\1%emacs_dir%\2!g' - -# Quote Sed special characters (except backslash and newline) with -# a double backslash. -msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g' - # The w32 build needs a slightly different editing, and it uses # nt/epaths.nt as the template. # @@ -344,8 +336,8 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g' epaths-force-w32: @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \ w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}"`; \ - w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \ - w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" | ${msys_w32prefix_subst}` ; \ + w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}"` ; \ + w32locallisppath=$${w32locallisppath//$${w32prefix}/"%emacs_dir%"} ; \ sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath//;/\\;}"'";' \ -e '/^.*#/s/@VER@/${version}/g' \ |