aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Moncayo2013-11-29 12:03:24 -0800
committerGlenn Morris2013-11-29 12:03:24 -0800
commit04445382cf67bdd47af5ff2f2c6fa9c910d46b17 (patch)
tree0fc17beece076ba69fe2e3bac263b6ab31fafad7
parentba25559eac42de6d061ecda14ac755d4c981f48b (diff)
downloademacs-04445382cf67bdd47af5ff2f2c6fa9c910d46b17.tar.gz
emacs-04445382cf67bdd47af5ff2f2c6fa9c910d46b17.zip
* Makefile.in (epaths-force-w32): Fix 2013-11-20 typo.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c2f85ce2b8..6a34a8f9cf0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-11-29 Dani Moncayo <dmoncayo@gmail.com>
2
3 * Makefile.in (epaths-force-w32): Fix 2013-11-20 typo.
4
12013-11-29 Stefan Monnier <monnier@iro.umontreal.ca> 52013-11-29 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * configure.ac (HAVE_MENUS): Remove. 7 * configure.ac (HAVE_MENUS): Remove.
diff --git a/Makefile.in b/Makefile.in
index 3e3a4f53bd2..065168bbce5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,7 +338,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
338epaths-force-w32: FRC 338epaths-force-w32: FRC
339 @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \ 339 @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
340 w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \ 340 w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
341 w32prefixpattern=`echo "${w32prefix}" | ${msys_sed_sh_escape}` ; \ 341 w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \
342 w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \ 342 w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \
343 sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \ 343 sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \
344 -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \ 344 -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \