Re: Some thing wrong with the site-lisp path in Windows 7

[Dani Moncayo <dmoncayo@gmail.com>]

On Fri, Nov 29, 2013 at 4:26 PM, Shuguang Sun <shuguang@gmail.com> wrote:
> I'm using Emacs in Windows 7. Everything works well in the trunk
> r115085-20131112. But when I try to use r115161-20131120 to r115271-20131128
> trunck, something goes wrong with site-lisp path.
>
> The two path in window relative to Emacs installed directory
>
> Emacs installed pathe/share/emacs/site-lisp
> C:\Users\username\emacs\share\emacs\site-lisp
>
> will be add to load-path automatically. However from the
> emacs-r115161-20131120-w32-bin.zip, the two paths are not in the load-path
> anymore. Instead, two absolute paths:
>
> c:/msys/local/share/emacs/24.3.50/site-lisp
> C:/msys/local/share/emacs/site-lisp
>
> are in the load-path. I have no msys installed in this machine.

That is a bug, indeed, because "c:/msys/local" should be the directory
where you installed Emacs.  And that bug was introduced by me (sorry).

The below patch solves the problem.  Please, could some maintainer
commit it?  TIA

diff --git a/Makefile.in b/Makefile.in
index 3e3a4f5..065168b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -338,7 +338,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
 epaths-force-w32: FRC
  @(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
   w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
-  w32prefixpattern=`echo "${w32prefix}" | ${msys_sed_sh_escape}` ; \
+  w32prefixpattern=`echo "$${w32prefix}" | ${msys_sed_sh_escape}` ; \
   w32locallisppath=`${srcdir}/build-aux/msys-to-w32
"${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \
   sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \
   -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \




-- 
Dani Moncayo