From: Glenn Morris Date: Tue, 10 Jan 2012 03:00:28 +0000 (-0500) Subject: Mainly comment fixes related to PATH_LOADSEARCH etc. X-Git-Tag: emacs-pretest-24.0.93~97^2~46 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b43da69cbda7874f223da3063da594a7fb84218;p=emacs.git Mainly comment fixes related to PATH_LOADSEARCH etc. * src/epaths.in (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH, PATH_EXEC) (PATH_DATA, PATH_DOC): Update the template values to be closer to their typical values these days. * Makefile.in, src/epaths.in: Comments. --- diff --git a/Makefile.in b/Makefile.in index 400fc73e6da..f178a3aeb16 100644 --- a/Makefile.in +++ b/Makefile.in @@ -208,11 +208,8 @@ lisppath=@lisppath@ # building. This is only used during the process of # compiling Emacs, to help Emacs find its lisp files # before they've been installed in their final location. -# It's usually identical to lisppath, except that -# it does not include locallisppath, and the -# entry for the directory containing the installed lisp -# files has been replaced with ../lisp. This should be a -# colon-separated list of directories. +# This should be a colon-separated list of directories. +# Normally it points to the lisp/ directory in the sources. buildlisppath=${srcdir}/lisp # Where to install the other architecture-independent diff --git a/src/ChangeLog b/src/ChangeLog index 9af9b88feef..71a4ddd2f2e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-10 Glenn Morris + + * epaths.in (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH, PATH_EXEC) + (PATH_DATA, PATH_DOC): Update the template values to be closer to + their typical values these days. + 2012-01-09 Eli Zaretskii * xdisp.c (rows_from_pos_range): Accept additional argument diff --git a/src/epaths.in b/src/epaths.in index 9ce1cefd211..b03a6a0cf03 100644 --- a/src/epaths.in +++ b/src/epaths.in @@ -19,27 +19,34 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -/* The default search path for Lisp function "load". - This sets load-path. */ -#define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" +/* 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: + /emacs/VERSION/site-lisp:/emacs/site-lisp: + /emacs/VERSION/lisp:/emacs/VERSION/leim + where datadir is eg /usr/local/share. + Configure prepends any $locallisppath, as set by the + --enable-locallisppath argument. +*/ +#define PATH_LOADSEARCH "/usr/local/share/emacs/lisp" -/* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This - path is usually identical to PATH_LOADSEARCH except that the entry - for the directory containing the installed lisp files has been - replaced with ../lisp. */ -#define PATH_DUMPLOADSEARCH "../lisp" +/* Like PATH_LOADSEARCH, but used only during the build process + when Emacs is dumping. Configure (using "make epaths-force") sets + this to $buildlisppath, which normally has the value: /lisp. +*/ +#define PATH_DUMPLOADSEARCH "/usr/local/share/emacs/lisp" /* The extra search path for programs to invoke. This is appended to whatever the PATH environment variable says to set the Lisp variable exec-path and the first file name in it sets the Lisp variable exec-directory. exec-directory is used for finding executables and other architecture-dependent files. */ -#define PATH_EXEC "/usr/local/lib/emacs/etc" +#define PATH_EXEC "/usr/local/libexec/emacs" /* Where Emacs should look for its architecture-independent data files, like the NEWS file. The lisp variable data-directory is set to this value. */ -#define PATH_DATA "/usr/local/lib/emacs/data" +#define PATH_DATA "/usr/local/share/emacs/etc" /* Where Emacs should look for X bitmap files. The lisp variable x-bitmap-file-path is set based on this value. */ @@ -47,7 +54,7 @@ along with GNU Emacs. If not, see . */ /* Where Emacs should look for its docstring file. The lisp variable doc-directory is set to this value. */ -#define PATH_DOC "/usr/local/lib/emacs/data" +#define PATH_DOC "/usr/local/share/emacs/etc" /* Where the configuration process believes the info tree lives. The lisp variable configure-info-directory gets its value from this