[Emacs-diffs] trunk r118317: Makefile.in (epaths-force-w32): Simplify.

[Dani Moncayo]

------------------------------------------------------------
revno: 118317
revision-id: address@hidden
parent: address@hidden
committer: Dani Moncayo <address@hidden>
branch nick: trunk
timestamp: Sat 2014-11-08 16:18:06 +0100
message:
  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).
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  Makefile.in                    makefile.in-20091113204419-o5vbwnq5f7feedwu-446

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-11-08 14:55:09 +0000
+++ b/ChangeLog 2014-11-08 15:18:06 +0000
@@ -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  <address@hidden>
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2014-11-08 14:55:09 +0000
+++ b/Makefile.in       2014-11-08 15:18:06 +0000
@@ -323,14 +323,6 @@
          -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 @@
 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'                       \