[Pinfo-devel] r287 - in pinfo/trunk: doc src

[Bas Zoetekouw]

Author: bas
Date: 2006-03-09 20:50:09 +0000 (Thu, 09 Mar 2006)
New Revision: 287

Modified:
   pinfo/trunk/doc/pinfo.1.in
   pinfo/trunk/doc/pinfo.texi
   pinfo/trunk/src/datatypes.c
Log:
Also search in /usr/info and /usr/local/info


Modified: pinfo/trunk/doc/pinfo.1.in
===================================================================
--- pinfo/trunk/doc/pinfo.1.in	2006-03-09 20:26:53 UTC (rev 286)
+++ pinfo/trunk/doc/pinfo.1.in	2006-03-09 20:50:09 UTC (rev 287)
@@ -13,10 +13,12 @@
 argument. This argument contains the name of an info page (i.e. 'bash').
 The program will then (by default) search for it in 
 .IR "./", 
+.IR "/usr/share/info",
 .IR "/usr/info",
-.IR "/usr/share/info",
+.IR "/usr/local/share/info",
+.IR "/usr/local/info".
 and
-.IR "/usr/local/info".
+.IR "/opt/info".
 The search path can be adjusted by INFOPATH environment variable or in the configuration
 file. Pinfo will also automatically add the suffix '-info', '-info.Z', '-info.gz', or '-info.bz2'.
 At present other suffixes are not recognized, but you can easily add them to

Modified: pinfo/trunk/doc/pinfo.texi
===================================================================
--- pinfo/trunk/doc/pinfo.texi	2006-03-09 20:26:53 UTC (rev 286)
+++ pinfo/trunk/doc/pinfo.texi	2006-03-09 20:50:09 UTC (rev 287)
@@ -103,8 +103,9 @@
 page you want to read by passing it an @var{info_page} argument. This argumen
 t
 contains the name of an info page (i.e. @samp{bash}). The program
-will then (by default) search for it in @file{./}, @file{/usr/info},
- at file{/usr/share/info} and @file{/usr/local/info}. Other searchpath may be
+will then (by default) search for it in @file{./}, @file{/usr/share/info},
+ at file{/usr/info}, @file{/usr/local/share/info}, @file{/usr/local/info},
+and @file{/opt/info}. Other searchpath may be
 specified in configfile or via INFOPATH environmental variable.
 Pinfo will also automaticaly add the suffix
 @samp{-info}, @samp{-info.Z}, @samp{-info.gz}, or @samp{-info.bz2}. At

Modified: pinfo/trunk/src/datatypes.c
===================================================================
--- pinfo/trunk/src/datatypes.c	2006-03-09 20:26:53 UTC (rev 286)
+++ pinfo/trunk/src/datatypes.c	2006-03-09 20:50:09 UTC (rev 287)
@@ -31,7 +31,7 @@
 char *maileditor = "mail";
 char *printutility = "lpr";
 char *manlinks = "1:8:2:3:4:5:6:7:9:n:l:p:o:3X11:3Xt:3X:3x";
-char *configuredinfopath = "/usr/share/info:/usr/local/share/info:/opt/info";
+char *configuredinfopath = "/usr/share/info:/usr/info:/usr/local/share/info:/usr/local/info:/opt/info";
 char *ignoredmacros = 0;
 char *rcfile = NULL;