From: Dani Moncayo <dmoncayo@gmail.com>
Date: Tue, 12 Nov 2013 02:40:14 +0000 (-0800)
Subject: * Makefile.in (epaths-force-w32): Simplify w32srcdir computation.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~864
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=632e833fee39b6facfb5f329e5cde45e2b25ccaf;p=emacs.git

* Makefile.in (epaths-force-w32): Simplify w32srcdir computation.
---

diff --git a/ChangeLog b/ChangeLog
index f1be2c7d655..d57ecf170b2 100644
--- 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:
diff --git a/Makefile.in b/Makefile.in
index 984dcea7cca..3de82097fb9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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.$$$$		\