diff options
| author | Dani Moncayo | 2013-11-11 18:40:14 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-11-11 18:40:14 -0800 |
| commit | 632e833fee39b6facfb5f329e5cde45e2b25ccaf (patch) | |
| tree | cd1d55e97e98044d4db7c63df7583ba16ed374ab | |
| parent | bd7cd30ac3b8a57d65f5925470784c8d6a308b5b (diff) | |
| download | emacs-632e833fee39b6facfb5f329e5cde45e2b25ccaf.tar.gz emacs-632e833fee39b6facfb5f329e5cde45e2b25ccaf.zip | |
* Makefile.in (epaths-force-w32): Simplify w32srcdir computation.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 2 |
2 files changed, 5 insertions, 1 deletions
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-11-12 Dani Moncayo <dmoncayo@gmail.com> | ||
| 2 | |||
| 3 | * Makefile.in (epaths-force-w32): Simplify w32srcdir computation. | ||
| 4 | |||
| 1 | 2013-11-08 Paul Eggert <eggert@cs.ucla.edu> | 5 | 2013-11-08 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 6 | ||
| 3 | Merge from gnulib, incorporating: | 7 | 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' | |||
| 351 | # the data directory. "pwd -W" produces Windows-style 'd:/foo/bar' | 351 | # the data directory. "pwd -W" produces Windows-style 'd:/foo/bar' |
| 352 | # absolute directory names, so we use it here to countermand that lossage. | 352 | # absolute directory names, so we use it here to countermand that lossage. |
| 353 | epaths-force-w32: FRC | 353 | epaths-force-w32: FRC |
| 354 | @(w32srcdir=`cd "${srcdir}"; pwd -W | sed -e 's,^\([A-Za-z]\):,/\1,' | ${msys_to_w32}` ; \ | 354 | @(w32srcdir=`cd "${srcdir}" && pwd -W` ; \ |
| 355 | prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \ | 355 | prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \ |
| 356 | locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \ | 356 | locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \ |
| 357 | sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ | 357 | sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ |