From 6c0a9ed1b100c4dfbac327e6405396f1586267eb Mon Sep 17 00:00:00 2001 From: Richard Copley Date: Fri, 7 Jun 2013 11:08:29 +0300 Subject: [PATCH] Fix bug #14513 with --enable-locallisppath not working on MS-Windows. Makefile.in (msys_to_w32): Modify to support d:\foo file names. (msys_lisppath_to_w32, msys_prefix_subst, msys_sed_sh_escape): New variables. (epaths-force-w32): Use them. epaths.nt (PATH_SITELOADSEARCH): Fix commentary. epaths.in: Fix commentary to PATH_SITELOADSEARCH. --- ChangeLog | 7 +++++++ Makefile.in | 27 +++++++++++++++++++++++++-- nt/ChangeLog | 4 ++++ nt/epaths.nt | 6 +++--- src/ChangeLog | 4 ++++ src/epaths.in | 6 +++--- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f5f932a559..b72a9544a96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-06-07 Richard Copley (tiny change) + + * Makefile.in (msys_to_w32): Modify to support d:\foo file names. + (msys_lisppath_to_w32, msys_prefix_subst, msys_sed_sh_escape): New + variables. + (epaths-force-w32): Use them. + 2013-06-03 Michael Albinus * configure.ac (HAVE_GFILENOTIFY): Check for gio >= 2.24. diff --git a/Makefile.in b/Makefile.in index 583aa99f83d..de406453983 100644 --- a/Makefile.in +++ b/Makefile.in @@ -318,14 +318,37 @@ epaths-force: FRC -e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \ ${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h -# Convert MSYS-style /x/foo file name into x:/foo that Windows can grok. -msys_to_w32=sed -e 's,^/\([A-Za-z]\)/,\1:/,' +# Convert MSYS-style /x/foo or Windows-style x:\foo file names +# into x:/foo that Windows can grok. +msys_to_w32=sed -e 's,\\\\,/,g' -e 's,^/\([A-Za-z]\)/,\1:/,' + +# Transform directory search path and its components. Original can +# be MSYS or Windows style. Set path separator to ";", directory +# separator to "/" and transform MSYS-style "/c/" to "c:/". +# Remove empty path components and escape semicolons. +msys_lisppath_to_w32=sed -e 's,\\\\,/,g' \ + -e 's,\(^\|[:;]\)\([A-Za-z]\):/,\1/\2/,g' \ + -e 's/:/;/g' -e 's,\(^\|;\)/\([A-Za-z]\)/,\1\2:/,g' \ + -e 's/;\+/;/g' -e 's/^;//' -e 's/;$$//' -e 's/;/\\\\;/g' + +# Replace "${prefix}" with '%emacs_dir%' (which expands to install +# directory at runtime). +msys_prefix_subst=sed -e 's!\(^\|;\)'"$${prefixpattern}"'\([;/]\|$$\)!\1%emacs_dir%\2!g' + +# Quote Sed special characters (except backslash and newline) with +# a double backslash. +msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g' # The w32 build needs a slightly different editing, and it uses # nt/epaths.nt as the template. +# Use the value of ${locallisppath} supplied by `configure', +# to support the --enable-locallisppath argument. epaths-force-w32: FRC @(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; \ + 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.$$$$ \ + -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \ -e '/^.*#/s/@VER@/${version}/g' \ -e '/^.*#/s/@CFG@/${configuration}/g' \ -e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \ diff --git a/nt/ChangeLog b/nt/ChangeLog index 41f6d81d592..5ed4dd2388c 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2013-06-07 Richard Copley (tiny change) + + * epaths.nt (PATH_SITELOADSEARCH): Fix commentary. + 2013-06-03 Eli Zaretskii * config.nt: Add HAVE_GFILENOTIFY, HAVE_W32NOTIFY and USE_FILE_NOTIFY. diff --git a/nt/epaths.nt b/nt/epaths.nt index 1e418550d52..6e297476528 100644 --- a/nt/epaths.nt +++ b/nt/epaths.nt @@ -41,10 +41,10 @@ along with GNU Emacs. If not, see . */ #define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim" /* Like PATH_LOADSEARCH, but contains the non-standard pieces. - These are the site-lisp directories, typically something like + These are the site-lisp directories. Configure sets this to + ${locallisppath}, which typically defaults to something like: /emacs/VERSION/site-lisp:/emacs/site-lisp - Configure prepends any $locallisppath, as set by the - --enable-locallisppath argument. + but can be overridden by the --enable-locallisppath argument. This is combined with PATH_LOADSEARCH to make the default load-path. If the --no-site-lisp option is used, this piece is excluded. */ diff --git a/src/ChangeLog b/src/ChangeLog index 5a25758c421..c104b23c75e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-06-07 Richard Copley (tiny change) + + * epaths.in: Fix commentary to PATH_SITELOADSEARCH. + 2013-06-06 Eli Zaretskii * xdisp.c (note_mouse_highlight): When mouse-highlight is off, diff --git a/src/epaths.in b/src/epaths.in index 0cf8cc9ce5b..1f5701e5337 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -30,10 +30,10 @@ along with GNU Emacs. If not, see . */ /* Like PATH_LOADSEARCH, but contains the non-standard pieces. - These are the site-lisp directories, typically something like + These are the site-lisp directories. Configure sets this to + ${locallisppath}, which typically defaults to something like: /emacs/VERSION/site-lisp:/emacs/site-lisp - Configure prepends any $locallisppath, as set by the - --enable-locallisppath argument. + but can be overridden by the --enable-locallisppath argument. This is combined with PATH_LOADSEARCH to make the default load-path. If the --no-site-lisp option is used, this piece is excluded. */