]> git.eshelyaron.com Git - emacs.git/commitdiff
* Makefile.in (epaths-force-w32): Simplify w32srcdir computation.
authorDani Moncayo <dmoncayo@gmail.com>
Tue, 12 Nov 2013 02:40:14 +0000 (18:40 -0800)
committerGlenn Morris <rgm@gnu.org>
Tue, 12 Nov 2013 02:40:14 +0000 (18:40 -0800)
ChangeLog
Makefile.in

index f1be2c7d65516e9bc5f393a1dfe312f47b7ed058..d57ecf170b2e5daa11fdc535ec51d2f1f12fb585 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-12  Dani Moncayo  <dmoncayo@gmail.com>
+
+       * Makefile.in (epaths-force-w32): Simplify w32srcdir computation.
+
 2013-11-08  Paul Eggert  <eggert@cs.ucla.edu>
 
        Merge from gnulib, incorporating:
index 984dcea7cca721e0502b45b67f694230d7905359..3de82097fb9a81b616bea4c79e1f4aa165b80186 100644 (file)
@@ -351,7 +351,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
 # the data directory.  "pwd -W" produces Windows-style 'd:/foo/bar'
 # absolute directory names, so we use it here to countermand that lossage.
 epaths-force-w32: FRC
-       @(w32srcdir=`cd "${srcdir}"; pwd -W | sed -e 's,^\([A-Za-z]\):,/\1,' | ${msys_to_w32}` ;        \
+       @(w32srcdir=`cd "${srcdir}" && pwd -W` ; \
          prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \
          locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \
          sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$          \