From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bruno Haible Newsgroups: gmane.emacs.devel Subject: Re: $prefix/info -> $prefix/share/info Date: Wed, 20 Dec 2006 15:24:38 +0100 Message-ID: <200612201524.38656.bruno@clisp.org> References: <200612181447.57052.bruno@clisp.org> NNTP-Posting-Host: dough.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit X-Trace: sea.gmane.org 1166624950 20844 80.91.229.10 (20 Dec 2006 14:29:10 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Wed, 20 Dec 2006 14:29:10 +0000 (UTC) Cc: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 20 15:29:09 2006 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by dough.gmane.org with esmtp (Exim 4.50) id 1Gx2RO-0002e3-HN for ged-emacs-devel@m.gmane.org; Wed, 20 Dec 2006 15:29:06 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gx2RO-00006A-0J for ged-emacs-devel@m.gmane.org; Wed, 20 Dec 2006 09:29:06 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Gx2R0-0008W5-2y for emacs-devel@gnu.org; Wed, 20 Dec 2006 09:28:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Gx2Qy-0008UH-Sh for emacs-devel@gnu.org; Wed, 20 Dec 2006 09:28:41 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Gx2Qy-0008U1-4p for emacs-devel@gnu.org; Wed, 20 Dec 2006 09:28:40 -0500 Original-Received: from [81.80.162.195] (helo=ftp.ilog.fr) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA:32) (Exim 4.52) id 1Gx2Qv-00026r-PD; Wed, 20 Dec 2006 09:28:38 -0500 Original-Received: from laposte.ilog.fr (cerbere-qfe0 [81.80.162.193]) by ftp.ilog.fr (8.13.1/8.13.1) with ESMTP id kBKESXcP022077; Wed, 20 Dec 2006 15:28:33 +0100 Original-Received: from marbore.ilog.biz (marbore.ilog.biz [172.17.2.61]) by laposte.ilog.fr (8.13.1/8.13.1) with ESMTP id kBKESSZj024221; Wed, 20 Dec 2006 15:28:28 +0100 Original-Received: from honolulu.ilog.fr ([172.16.15.3]) by marbore.ilog.biz with Microsoft SMTPSVC(6.0.3790.1830); Wed, 20 Dec 2006 15:29:16 +0100 Original-Received: by honolulu.ilog.fr (Postfix, from userid 1001) id C92FD3F420; Wed, 20 Dec 2006 15:24:38 +0100 (CET) Original-To: rms@gnu.org User-Agent: KMail/1.9.1 In-Reply-To: Content-Disposition: inline X-OriginalArrivalTime: 20 Dec 2006 14:29:16.0910 (UTC) FILETIME=[3AABE0E0:01C72443] X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:64002 Archived-At: RMS wrote: > *************** > *** 463,474 **** > (expand-file-name "info/" installation-directory) > (if invocation-directory > (let ((infodir (expand-file-name > ! "../info/" > invocation-directory))) > (if (file-exists-p infodir) > infodir > (setq infodir (expand-file-name > ! "../../../info/" > invocation-directory)) > (and (file-exists-p infodir) > infodir)))))) > --- 463,474 ---- > (expand-file-name "info/" installation-directory) > (if invocation-directory > (let ((infodir (expand-file-name > ! "../share/info/" > invocation-directory))) > (if (file-exists-p infodir) > infodir > (setq infodir (expand-file-name > ! "../../../share/info/" > invocation-directory)) > (and (file-exists-p infodir) > infodir)))))) > > I think that part is not correct. It assumes invocation-directory > will be /usr/local/SOMETHING, and that is not likely at all. It doesn't look like that to me. The code either assumes that the invocation-directory is 1 level under $prefix (such as $prefix/bin) or 3 levels under $prefix (such as $prefix/arch/x86/bin). In a normal install from source on Unix, invocation-directory is actually $prefix/bin. The proposed patch only changes the relative path of the infodir, relative to $prefix. > diff -r -c3 --exclude=configure emacs-22.0.90.orig/lisp/paths.el emacs-22.0.90/lisp/paths.el > *** emacs-22.0.90.orig/lisp/paths.el 2006-09-04 19:36:11.000000000 +0200 > --- emacs-22.0.90/lisp/paths.el 2006-11-15 03:21:39.000000000 +0100 > *************** > *** 68,74 **** > (suffixes > ;; Subdirectories in each directory tree that may contain info > ;; directories. > ! '("" "share/" "gnu/" "gnu/lib/" "gnu/lib/emacs/" > "emacs/" "lib/" "lib/emacs/")) > (standard-info-dirs > (apply #'nconc > --- 68,74 ---- > (suffixes > ;; Subdirectories in each directory tree that may contain info > ;; directories. > ! '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/" > "emacs/" "lib/" "lib/emacs/")) > (standard-info-dirs > (apply #'nconc > > What is the motive for this change? The purpose is to search $prefix/share/info/ before $prefix/info/. As many packages start using autoconf >= 2.60, new manuals are installed into $prefix/share/info/. A user who installs successive versions of a package will thus have the old manual in $prefix/info/ and the newest manual in $prefix/share/info/, and he wants to see the newest manual. Bruno