- up to 0.6.9

[packages/pinfo.git] / pinfo-home_etc.patch

diff -ur pinfo-0.6.9.org/doc/pinfo.1 pinfo-0.6.9/doc/pinfo.1
--- pinfo-0.6.9.org/doc/pinfo.1	2006-03-16 17:27:56.000000000 +0100
+++ pinfo-0.6.9/doc/pinfo.1	2006-03-18 19:21:54.315546250 +0100
@@ -133,7 +133,7 @@
 
 .SH COLOR AND KEY DEFINITIONS
 .P
-There are configuration files called ~/.pinforc and
+There are configuration files called $HOME_ETC/.pinforc or ~/.pinforc and
 [prefix]/etc/pinforc, for local and global configuration (where prefix is the
 prefix of the directory, where pinfo is installed, i.e. /usr/local, or /).
 Here's an example of such a file; we'll discuss the contents below:
diff -ur pinfo-0.6.9.org/doc/pinfo.1.in pinfo-0.6.9/doc/pinfo.1.in
--- pinfo-0.6.9.org/doc/pinfo.1.in	2006-03-09 21:54:33.000000000 +0100
+++ pinfo-0.6.9/doc/pinfo.1.in	2006-03-18 19:21:54.319546500 +0100
@@ -133,7 +133,7 @@
 
 .SH COLOR AND KEY DEFINITIONS
 .P
-There are configuration files called ~/.pinforc and
+There are configuration files called $HOME_ETC/.pinforc or ~/.pinforc and
 [prefix]/etc/pinforc, for local and global configuration (where prefix is the
 prefix of the directory, where pinfo is installed, i.e. /usr/local, or /).
 Here's an example of such a file; we'll discuss the contents below:
diff -ur pinfo-0.6.9.org/doc/pinfo.info pinfo-0.6.9/doc/pinfo.info
--- pinfo-0.6.9.org/doc/pinfo.info	2006-03-16 17:28:00.000000000 +0100
+++ pinfo-0.6.9/doc/pinfo.info	2006-03-18 19:21:54.319546500 +0100
@@ -174,8 +174,8 @@
 file::, and at the key descriptions, *Note Keys::. Keys available in
 manual viewer differ a bit from the keys available in info viewer.
 
-   There are configuration files called `~/.pinforc' and
-`[prefix]/etc/pinforc', for local and global configuration (where
+   There are configuration files called `$HOME_ETC/.pinforc' or `~/.pinforc'
+and `[prefix]/etc/pinforc', for local and global configuration (where
 prefix is the prefix of the directory, where `pinfo' is installed, i.e.
 `/usr/local', or `/usr').
 
diff -ur pinfo-0.6.9.org/doc/pinfo.texi pinfo-0.6.9/doc/pinfo.texi
--- pinfo-0.6.9.org/doc/pinfo.texi	2006-03-16 16:40:41.000000000 +0100
+++ pinfo-0.6.9/doc/pinfo.texi	2006-03-18 19:21:54.319546500 +0100
@@ -202,8 +202,8 @@
 file}, and at the key descriptions, @xref{Keys}. Keys available in
 manual viewer differ a bit from the keys available in info viewer.
 
-There are configuration files called @file{~/.pinforc} and
-@file{[prefix]/etc/pinforc}, for local and global configuration (where
+There are configuration files called @file{$HOME_ETC/.pinforc} or @file{~/.pinforc}
+and @file{[prefix]/etc/pinforc}, for local and global configuration (where
 prefix is the prefix of the directory, where @value{PROGRAM} is
 installed, i.e. @file{/usr/local}, or @file{/usr}).
 
diff -ur pinfo-0.6.9.org/src/parse_config.c pinfo-0.6.9/src/parse_config.c
--- pinfo-0.6.9.org/src/parse_config.c	2006-03-09 20:44:51.000000000 +0100
+++ pinfo-0.6.9/src/parse_config.c	2006-03-18 19:22:32.693944750 +0100
@@ -118,7 +118,9 @@
 	{
 		if (rcfile == NULL)
 		{
-			if (getenv("HOME"))
+			if (getenv ("HOME_ETC"))
+				home = strdup (getenv ("HOME_ETC"));
+			else if (getenv ("HOME"))
 				home = strdup(getenv("HOME"));
 			else
 				home = 0;