[packages/emacs.git] / emacs-paths.patch

diff -Nru emacs-20.7/lisp/paths.el emacs-20.7.new/lisp/paths.el
--- emacs-20.7/lisp/paths.el	Tue May 30 22:12:00 2000
+++ emacs-20.7.new/lisp/paths.el	Sun Feb  4 10:45:17 2001
@@ -33,20 +33,13 @@
 ;;; Code:
 
 (defvar Info-default-directory-list
-  (let* ((start (list "/usr/local/lib/info/"
-		      ;; This comes second so that, if it is the same
-		      ;; as configure-info-directory (which is usually true)
-		      ;; and Emacs has been installed (also usually true)
-		      ;; then the list will end with two copies of this;
-		      ;; which means that the last dir file Info-insert-dir
-		      ;; finds will be the one in this directory.
-		      "/usr/local/info/"))
+  (let* ((start (list "/usr/share/info/"))
 	 ;; Typically on a GNU system, installed info files are found
 	 ;; in /usr/info, but the default prefix is /usr/local.
 	 ;; (Standalone info has a long list of alternative
 	 ;; directories to search; perhaps we should try to be more
 	 ;; consistent.)
-	 (usrdir "/usr/info")
+	 (usrdir "/usr/share/info")
 	 (sysdir (and (file-directory-p usrdir)
 		      (not (string= configure-info-directory usrdir))
 		      (list usrdir)))
@@ -74,10 +67,6 @@
 
 (defvar news-inews-program
   (cond ((file-exists-p "/usr/bin/inews") "/usr/bin/inews")
-	((file-exists-p "/usr/local/inews") "/usr/local/inews")
-	((file-exists-p "/usr/local/bin/inews") "/usr/local/bin/inews")
-	((file-exists-p "/usr/contrib/lib/news/inews") "/usr/contrib/lib/news/inews")
-	((file-exists-p "/usr/lib/news/inews") "/usr/lib/news/inews")
 	(t "inews"))
   "Program to post news.")
 
@@ -105,18 +94,11 @@
 (defconst rmail-spool-directory
   (cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
 	 "/usr/spool/mail/")
-	;; On The Bull DPX/2 /usr/spool/mail is used although 
-	;; it is usg-unix-v.
-	((string-match "^m68k-bull-sysv3" system-configuration)
-	 "/usr/spool/mail/")
 	;; SVR4 and recent BSD are said to use this.
 	;; Rather than trying to know precisely which systems use it,
 	;; let's assume this dir is never used for anything else.
 	((file-exists-p "/var/mail")
 	 "/var/mail/")
-	;; Many GNU/Linux systems use this name.
-	((file-exists-p "/var/spool/mail")
-	 "/var/spool/mail/")
 	((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
 	 "/usr/mail/")
 	(t "/usr/spool/mail/"))
@@ -125,9 +107,7 @@
 
 (defconst sendmail-program
   (cond
-    ((file-exists-p "/usr/sbin/sendmail") "/usr/sbin/sendmail")
     ((file-exists-p "/usr/lib/sendmail") "/usr/lib/sendmail")
-    ((file-exists-p "/usr/ucblib/sendmail") "/usr/ucblib/sendmail")
     (t "fakemail"))			;In ../etc, to interface to /bin/mail.
   "Program used to send messages.")
 
@@ -139,17 +119,6 @@
    ;; almost certainly in /bin or /usr/bin, so it's probably safe to assume
    ;; that an rsh found elsewhere is the remote shell program.  The converse
    ;; is not true: /usr/bin/rsh could be either one, so check that last.
-   ((file-exists-p "/usr/ucb/remsh") "/usr/ucb/remsh")
-   ((file-exists-p "/usr/bsd/remsh") "/usr/bsd/remsh")
-   ((file-exists-p "/bin/remsh") "/bin/remsh")
-   ((file-exists-p "/usr/bin/remsh") "/usr/bin/remsh")
-   ((file-exists-p "/usr/local/bin/remsh") "/usr/local/bin/remsh")
-   ((file-exists-p "/usr/ucb/rsh") "/usr/ucb/rsh")
-   ((file-exists-p "/usr/bsd/rsh") "/usr/bsd/rsh")
-   ((file-exists-p "/usr/local/bin/rsh") "/usr/local/bin/rsh")
-   ((file-exists-p "/usr/bin/rcmd") "/usr/bin/rcmd")
-   ((file-exists-p "/bin/rcmd") "/bin/rcmd")
-   ((file-exists-p "/bin/rsh") "/bin/rsh")
    ((file-exists-p "/usr/bin/rsh") "/usr/bin/rsh")
    (t "rsh")))
 
diff -Nru emacs-20.7/src/epaths.in emacs-20.7.new/src/epaths.in
--- emacs-20.7/src/epaths.in	Sat Aug 16 20:29:06 1997
+++ emacs-20.7.new/src/epaths.in	Sun Feb  4 10:38:22 2001
@@ -2,7 +2,7 @@
 
 /* The default search path for Lisp function "load".
    This sets load-path.  */
-#define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp"
+#define PATH_LOADSEARCH "/usr/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
@@ -15,25 +15,25 @@
    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/share/emacs/etc"
 
 /* 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/share/emacs/data"
 
 /* Where Emacs should look for X bitmap files.
    The lisp variable x-bitmap-file-path is set based on this value.  */
-#define PATH_BITMAPS "/usr/include/X11/bitmaps"
+#define PATH_BITMAPS "/usr/X11R6/lib/X11/bitmaps"
 
 /* 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/share/emacs/data"
 
 /* Where the configuration process believes the info tree lives.  The
    lisp variable configure-info-directory gets its value from this
    macro, and is then used to set the Info-default-directory-list.  */
-#define PATH_INFO "/usr/local/info"
+#define PATH_INFO "/usr/share/info"
 
 /* Where Emacs should look for the application default file. */
 #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"
Commit	Line	Data
71575aca	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
	4	@@ -33,20 +33,13 @@
	5	;;; Code:
	6
	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
	21	;; consistent.)
	22	- (usrdir "/usr/info")
	23	+ (usrdir "/usr/share/info")
	24	(sysdir (and (file-directory-p usrdir)
	25	(not (string= configure-info-directory usrdir))
	26	(list usrdir)))
	27	@@ -74,10 +67,6 @@
	28
	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")
	35	(t "inews"))
	36	"Program to post news.")
	37
	38	@@ -105,18 +94,11 @@
	39	(defconst rmail-spool-directory
	40	(cond ((string-match "^[^-]+-[^-]+-sco3.2v4" system-configuration)
	41	"/usr/spool/mail/")
	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)
	45	- "/usr/spool/mail/")
	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")
	50	"/var/mail/")
	51	- ;; Many GNU/Linux systems use this name.
	52	- ((file-exists-p "/var/spool/mail")
	53	- "/var/spool/mail/")
	54	((memq system-type '(dgux hpux usg-unix-v unisoft-unix rtu irix))
	55	"/usr/mail/")
	56	(t "/usr/spool/mail/"))
	57	@@ -125,9 +107,7 @@
	58
	59	(defconst sendmail-program
	60	(cond
	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.")
66
67	@@ -139,17 +119,6 @@
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")
83	(t "rsh")))
84
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
88	@@ -2,7 +2,7 @@
89
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"
94
95	/* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This
96	path is usually identical to PATH_LOADSEARCH except that the entry
97	@@ -15,25 +15,25 @@
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"
103
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"
109
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"
114
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"
119
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"
125
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"