From 632e833fee39b6facfb5f329e5cde45e2b25ccaf Mon Sep 17 00:00:00 2001 From: Dani Moncayo Date: Mon, 11 Nov 2013 18:40:14 -0800 Subject: [PATCH] * Makefile.in (epaths-force-w32): Simplify w32srcdir computation. --- ChangeLog | 4 ++++ Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f1be2c7d655..d57ecf170b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-11-12 Dani Moncayo + + * Makefile.in (epaths-force-w32): Simplify w32srcdir computation. + 2013-11-08 Paul Eggert 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.$$$$ \ -- 2.39.2