diff options
author | Dani Moncayo <dmoncayo@gmail.com> | 2014-11-08 15:55:09 +0100 |
---|---|---|
committer | Dani Moncayo <dmoncayo@gmail.com> | 2014-11-08 15:55:09 +0100 |
commit | 7c86a2a7d82558206a96139bab73552003b3c28f (patch) | |
tree | 211df85fd9385ce2f3a28d1bd9663af7ca98dcfc /Makefile.in | |
parent | c936cbbc830b194dbb1cd7ff039ea9978a7ab607 (diff) | |
download | emacs-7c86a2a7d82558206a96139bab73552003b3c28f.tar.gz |
build-aux/msys-to-w32: simplify the initial interface.
* build-aux/msys-to-w32: simplify the initial over-engineered
interface, and the implementation.
* Makefile.in (epaths-force-w32): Update for the above.
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 0c11828deb2..5dbe514e22a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -343,11 +343,11 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g' # '/foo/bar'). epaths-force-w32: @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \ - w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \ + w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}"`; \ w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \ - w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \ + w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" | ${msys_w32prefix_subst}` ; \ sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ - -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \ + -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath//;/\\;}"'";' \ -e '/^.*#/s/@VER@/${version}/g' \ -e '/^.*#/s/@CFG@/${configuration}/g' \ -e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \ |