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 /src/epaths.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 'src/epaths.in')
| -rw-r--r-- | src/epaths.in | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/epaths.in b/src/epaths.in index 17cb65a3234..705fe3aab1b 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -19,16 +19,26 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* The default value of load-path, which is the search path for - the Lisp function "load". Configure (using "make epaths-force") - sets this to $lisppath, which typically has a value like: - <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp: +/* Together with PATH_SITELOADSEARCH, this gives the default value of + load-path, which is the search path for the Lisp function "load". + Configure (using "make epaths-force") sets this to + ${standardlisppath}, which typically has a value like: <datadir>/emacs/VERSION/lisp:<datadir>/emacs/VERSION/leim where datadir is eg /usr/local/share. +*/ +#define PATH_LOADSEARCH "/usr/local/share/emacs/lisp" + + +/* Like PATH_LOADSEARCH, but contains the non-standard pieces. + These are the site-lisp directories, typically something like + <datadir>/emacs/VERSION/site-lisp:<datadir>/emacs/site-lisp Configure prepends any $locallisppath, as set 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. */ -#define PATH_LOADSEARCH "/usr/local/share/emacs/lisp" +#define PATH_SITELOADSEARCH "/usr/local/share/emacs/site-lisp" + /* Like PATH_LOADSEARCH, but used only during the build process when Emacs is dumping. Configure (using "make epaths-force") sets |