aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-10-23 18:33:08 -0400
committerGlenn Morris2013-10-23 18:33:08 -0400
commit4b56b9d7038bbb446697ecd6f2d4c2fe66f173e2 (patch)
tree0d269b29785718b04bf5ee1ebfac91de29f3e509
parentfb6f3c4a164df27150517cd10741f50a8b82f442 (diff)
downloademacs-4b56b9d7038bbb446697ecd6f2d4c2fe66f173e2.tar.gz
emacs-4b56b9d7038bbb446697ecd6f2d4c2fe66f173e2.zip
* Makefile.in (epaths-force-w32): Use abs_srcdir
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a57b88a89c7..e7df2d1c0d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,7 +13,7 @@
13 Make building in directories with whitespace possible. (Bug#15675) 13 Make building in directories with whitespace possible. (Bug#15675)
14 * configure.ac (srcdir): Don't make it absolute - abs_srcdir exists. 14 * configure.ac (srcdir): Don't make it absolute - abs_srcdir exists.
15 * Makefile.in (abs_srcdir): New, set by configure. 15 * Makefile.in (abs_srcdir): New, set by configure.
16 (buildlisppath): Use abs_srcdir. 16 (buildlisppath, epaths-force-w32): Use abs_srcdir.
17 (install-arch-indep, install-etcdoc, install-info, install-man) 17 (install-arch-indep, install-etcdoc, install-info, install-man)
18 (install-etc): Quote entities that might contain whitespace. 18 (install-etc): Quote entities that might contain whitespace.
19 19
diff --git a/Makefile.in b/Makefile.in
index f97b03b99e0..7ad0bf13ae4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -341,7 +341,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
341# Use the value of ${locallisppath} supplied by `configure', 341# Use the value of ${locallisppath} supplied by `configure',
342# to support the --enable-locallisppath argument. 342# to support the --enable-locallisppath argument.
343epaths-force-w32: FRC 343epaths-force-w32: FRC
344 @(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; \ 344 @(w32srcdir=`echo "${abs_srcdir}" | ${msys_to_w32}` ; \
345 prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \ 345 prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \
346 locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \ 346 locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} | ${msys_prefix_subst}` ; \
347 sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ 347 sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \