diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-06-30 14:10:50 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-06-30 14:10:50 -0700 |
| commit | ca26824cb07d494481a14fea1642d38ad6c2a9e4 (patch) | |
| tree | c0a3d299f228fd444741729ea0549c1927f96582 /Makefile.in | |
| parent | 9ff8f76bbca43e021f842b24493885f1c034f6a4 (diff) | |
| download | emacs-ca26824cb07d494481a14fea1642d38ad6c2a9e4.tar.gz | |
Make --no-site-lisp work for --enable-locallisppath elements
without "site-lisp" in the name.
Ref http://debbugs.gnu.org/10208#25, point iii).
* configure.in (standardlisppath): New output variable.
(lisppath): Use standardlisppath.
* Makefile.in (standardlisppath): New, set by configure.
(epaths-force): Use standardlisppath and locallisppath rather than lisppath.
* src/epaths.in (PATH_SITELOADSEARCH): New.
* src/lread.c (init_lread): Use PATH_SITELOADSEARCH.
* nt/paths.h (PATH_SITELOADSEARCH): New.
Fixes: debbugs:11658
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index fb2530d13df..0900bd1946f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,16 +186,20 @@ iconsrcdir=$(srcdir)/etc/images/icons lispdir=@lispdir@ leimdir=@leimdir@ -# Directories Emacs should search for lisp files specific -# to this site (i.e. customizations), before consulting -# ${lispdir}. This should be a colon-separated list of -# directories. +# Directories Emacs should search for standard lisp files. +# The default is ${lispdir}:${leimdir}. +standardlisppath=@standardlisppath@ + +# Directories Emacs should search for lisp files specific to this +# site (i.e. customizations), before consulting ${standardlisppath}. +# This should be a colon-separated list of directories. locallisppath=@locallisppath@ # Where Emacs will search to find its lisp files. Before # changing this, check to see if your purpose wouldn't # better be served by changing locallisppath. This # should be a colon-separated list of directories. +# The default is ${locallisppath}:${standardlisppath}. lisppath=@lisppath@ # Where Emacs will search for its lisp files while @@ -281,12 +285,14 @@ removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' # to just letting configure generate epaths.h from epaths.in in a # similar way to how Makefile is made from Makefile.in. epaths-force: FRC - @(lisppath=`echo ${lisppath} | ${removenullpaths}` ; \ + @(standardlisppath=`echo ${standardlisppath} | ${removenullpaths}` ; \ + locallisppath=`echo ${locallisppath} | ${removenullpaths}` ; \ buildlisppath=`echo ${buildlisppath} | ${removenullpaths}` ; \ x_default_search_path=`echo ${x_default_search_path}`; \ gamedir=`echo ${gamedir}`; \ sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \ - -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${lisppath}"'";' \ + -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'"$${standardlisppath}"'";' \ + -e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${locallisppath}"'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'"$${buildlisppath}"'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ |