1 diff -Nru emacs-20.7/lisp/paths.el emacs-20.7.new/lisp/paths.el
2 --- emacs-20.7/lisp/paths.el Tue May 30 22:12:00 2000
3 +++ emacs-20.7.new/lisp/paths.el Sun Feb 4 10:45:17 2001
7 (defvar Info-default-directory-list
8 - (let* ((start (list "/usr/local/lib/info/"
9 - ;; This comes second so that, if it is the same
10 - ;; as configure-info-directory (which is usually true)
11 - ;; and Emacs has been installed (also usually true)
12 - ;; then the list will end with two copies of this;
13 - ;; which means that the last dir file Info-insert-dir
14 - ;; finds will be the one in this directory.
15 - "/usr/local/info/"))
16 + (let* ((start (list "/usr/share/info/"))
17 ;; Typically on a GNU system, installed info files are found
18 ;; in /usr/info, but the default prefix is /usr/local.
19 ;; (Standalone info has a long list of alternative
20 ;; directories to search; perhaps we should try to be more
22 - (usrdir "/usr/info")
23 + (usrdir "/usr/share/info")
24 (sysdir (and (file-directory-p usrdir)
25 (not (string= configure-info-directory usrdir))
29 (defvar news-inews-program
30 (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
31 - ((file-exists-p "/usr/local/inews") "/usr/local/inews")
32 - ((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
33 - ((file-exists-p "/usr/contrib/lib/news/inews") "/usr/contrib/lib/news/inews")
34 - ((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
36 "Program to post news.")
39 (defconst rmail-spool-directory
40 (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
42 - ;; On The Bull DPX/2 /usr/spool/mail is used although
43 - ;; it is usg-unix-v.
44 - ((string-match "^m68k-bull-sysv3" system-configuration)
46 ;; SVR4 and recent BSD are said to use this.
47 ;; Rather than trying to know precisely which systems use it,
48 ;; let's assume this dir is never used for anything else.
49 ((file-exists-p "/var/mail")
51 - ;; Many GNU/Linux systems use this name.
52 - ((file-exists-p "/var/spool/mail")
54 ((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
56 (t "/usr/spool/mail/"))
59 (defconst sendmail-program
61 - ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
62 ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
63 - ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
64 (t "fakemail")) ;In ../etc, to interface to /bin/mail.
65 "Program used to send messages.")
68 ;; almost certainly in /bin or /usr/bin, so it's probably safe to assume
69 ;; that an rsh found elsewhere is the remote shell program. The converse
70 ;; is not true: /usr/bin/rsh could be either one, so check that last.
71 - ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh")
72 - ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh")
73 - ((file-exists-p "/bin/remsh") "/bin/remsh")
74 - ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh")
75 - ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh")
76 - ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
77 - ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh")
78 - ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh")
79 - ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd")
80 - ((file-exists-p "/bin/rcmd") "/bin/rcmd")
81 - ((file-exists-p "/bin/rsh") "/bin/rsh")
82 ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
85 diff -Nru emacs-20.7/src/epaths.in emacs-20.7.new/src/epaths.in
86 --- emacs-20.7/src/epaths.in Sat Aug 16 20:29:06 1997
87 +++ emacs-20.7.new/src/epaths.in Sun Feb 4 10:38:22 2001
90 /* The default search path for Lisp function "load".
91 This sets load-path. */
92 -#define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp"
93 +#define PATH_LOADSEARCH "/usr/share/emacs/lisp"
95 /* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This
96 path is usually identical to PATH_LOADSEARCH except that the entry
98 variable exec-path and the first file name in it sets the Lisp
99 variable exec-directory. exec-directory is used for finding
100 executables and other architecture-dependent files. */
101 -#define PATH_EXEC "/usr/local/lib/emacs/etc"
102 +#define PATH_EXEC "/usr/share/emacs/etc"
104 /* Where Emacs should look for its architecture-independent data
105 files, like the NEWS file. The lisp variable data-directory
106 is set to this value. */
107 -#define PATH_DATA "/usr/local/lib/emacs/data"
108 +#define PATH_DATA "/usr/share/emacs/data"
110 /* Where Emacs should look for X bitmap files.
111 The lisp variable x-bitmap-file-path is set based on this value. */
112 -#define PATH_BITMAPS "/usr/include/X11/bitmaps"
113 +#define PATH_BITMAPS "/usr/X11R6/lib/X11/bitmaps"
115 /* Where Emacs should look for its docstring file. The lisp variable
116 doc-directory is set to this value. */
117 -#define PATH_DOC "/usr/local/lib/emacs/data"
118 +#define PATH_DOC "/usr/share/emacs/data"
120 /* Where the configuration process believes the info tree lives. The
121 lisp variable configure-info-directory gets its value from this
122 macro, and is then used to set the Info-default-directory-list. */
123 -#define PATH_INFO "/usr/local/info"
124 +#define PATH_INFO "/usr/share/info"
126 /* Where Emacs should look for the application default file. */
127 #define PATH_X_DEFAULTS "/usr/lib/X11/%L/%T/%N%C%S:/usr/lib/X11/%l/%T/%N%C%S:/usr/lib/X11/%T/%N%C%S:/usr/lib/X11/%L/%T/%N%S:/usr/lib/X11/%l/%T/%N%S:/usr/lib/X11/%T/%N%S"