]>
Commit | Line | Data |
---|---|---|
e5c377db AM |
1 | diff -ur pinfo-0.6.9.org/doc/pinfo.1 pinfo-0.6.9/doc/pinfo.1 |
2 | --- pinfo-0.6.9.org/doc/pinfo.1 2006-03-16 17:27:56.000000000 +0100 | |
3 | +++ pinfo-0.6.9/doc/pinfo.1 2006-03-18 19:21:54.315546250 +0100 | |
4 | @@ -133,7 +133,7 @@ | |
27cfd034 | 5 | |
6 | .SH COLOR AND KEY DEFINITIONS | |
7 | .P | |
8 | -There are configuration files called ~/.pinforc and | |
9 | +There are configuration files called $HOME_ETC/.pinforc or ~/.pinforc and | |
10 | [prefix]/etc/pinforc, for local and global configuration (where prefix is the | |
11 | prefix of the directory, where pinfo is installed, i.e. /usr/local, or /). | |
12 | Here's an example of such a file; we'll discuss the contents below: | |
e5c377db AM |
13 | diff -ur pinfo-0.6.9.org/doc/pinfo.1.in pinfo-0.6.9/doc/pinfo.1.in |
14 | --- pinfo-0.6.9.org/doc/pinfo.1.in 2006-03-09 21:54:33.000000000 +0100 | |
15 | +++ pinfo-0.6.9/doc/pinfo.1.in 2006-03-18 19:21:54.319546500 +0100 | |
16 | @@ -133,7 +133,7 @@ | |
27cfd034 | 17 | |
18 | .SH COLOR AND KEY DEFINITIONS | |
19 | .P | |
20 | -There are configuration files called ~/.pinforc and | |
21 | +There are configuration files called $HOME_ETC/.pinforc or ~/.pinforc and | |
22 | [prefix]/etc/pinforc, for local and global configuration (where prefix is the | |
23 | prefix of the directory, where pinfo is installed, i.e. /usr/local, or /). | |
24 | Here's an example of such a file; we'll discuss the contents below: | |
e5c377db AM |
25 | diff -ur pinfo-0.6.9.org/doc/pinfo.info pinfo-0.6.9/doc/pinfo.info |
26 | --- pinfo-0.6.9.org/doc/pinfo.info 2006-03-16 17:28:00.000000000 +0100 | |
27 | +++ pinfo-0.6.9/doc/pinfo.info 2006-03-18 19:21:54.319546500 +0100 | |
28 | @@ -174,8 +174,8 @@ | |
27cfd034 | 29 | file::, and at the key descriptions, *Note Keys::. Keys available in |
30 | manual viewer differ a bit from the keys available in info viewer. | |
31 | ||
32 | - There are configuration files called `~/.pinforc' and | |
33 | -`[prefix]/etc/pinforc', for local and global configuration (where | |
34 | + There are configuration files called `$HOME_ETC/.pinforc' or `~/.pinforc' | |
35 | +and `[prefix]/etc/pinforc', for local and global configuration (where | |
36 | prefix is the prefix of the directory, where `pinfo' is installed, i.e. | |
37 | `/usr/local', or `/usr'). | |
38 | ||
e5c377db AM |
39 | diff -ur pinfo-0.6.9.org/doc/pinfo.texi pinfo-0.6.9/doc/pinfo.texi |
40 | --- pinfo-0.6.9.org/doc/pinfo.texi 2006-03-16 16:40:41.000000000 +0100 | |
41 | +++ pinfo-0.6.9/doc/pinfo.texi 2006-03-18 19:21:54.319546500 +0100 | |
42 | @@ -202,8 +202,8 @@ | |
27cfd034 | 43 | file}, and at the key descriptions, @xref{Keys}. Keys available in |
44 | manual viewer differ a bit from the keys available in info viewer. | |
45 | ||
46 | -There are configuration files called @file{~/.pinforc} and | |
47 | -@file{[prefix]/etc/pinforc}, for local and global configuration (where | |
48 | +There are configuration files called @file{$HOME_ETC/.pinforc} or @file{~/.pinforc} | |
49 | +and @file{[prefix]/etc/pinforc}, for local and global configuration (where | |
50 | prefix is the prefix of the directory, where @value{PROGRAM} is | |
51 | installed, i.e. @file{/usr/local}, or @file{/usr}). | |
52 | ||
e5c377db AM |
53 | diff -ur pinfo-0.6.9.org/src/parse_config.c pinfo-0.6.9/src/parse_config.c |
54 | --- pinfo-0.6.9.org/src/parse_config.c 2006-03-09 20:44:51.000000000 +0100 | |
55 | +++ pinfo-0.6.9/src/parse_config.c 2006-03-18 19:22:32.693944750 +0100 | |
56 | @@ -118,7 +118,9 @@ | |
57 | { | |
58 | if (rcfile == NULL) | |
59 | { | |
60 | - if (getenv("HOME")) | |
61 | + if (getenv ("HOME_ETC")) | |
62 | + home = strdup (getenv ("HOME_ETC")); | |
63 | + else if (getenv ("HOME")) | |
64 | home = strdup(getenv("HOME")); | |
65 | else | |
66 | home = 0; |