>From: "Jordan K. Hubbard" <jkh%whisker.lotus.ie@dec4ie.ieunet.ie>

Date: Sat, 25 Sep 1993 00:04:51 -0700

/usr/X386/bin and /usr/X386/man probably would be a nice touch too.

Rod:
Also cleaned out the #ifdef 0 /*before reorg*/ as this is just old cruft
from before 4.3.  Added /usr/local/src as a possible source directory,
added rest of missing /usr/src areas, reordered all of these to make
more since.
Updated binary paths to be more reasonable (removed things that are
very old like /usr/ucb, /usr/old)

diff --git a/usr.bin/whereis/whereis.c b/usr.bin/whereis/whereis.c
index d60eddf..27137f6 100644 (file)
--- a/usr.bin/whereis/whereis.c
+++ b/usr.bin/whereis/whereis.c
@@ -49,35 +49,16 @@ static char sccsid[] = "@(#)whereis.c       5.5 (Berkeley) 4/18/91";
 static char *bindirs[] = {
        "/bin",
        "/sbin",
 static char *bindirs[] = {
        "/bin",
        "/sbin",

-       "/usr/ucb",

        "/usr/bin",
        "/usr/bin",

-       "/usr/sbin",
-       "/usr/old",
-       "/usr/contrib",

        "/usr/games",
        "/usr/gnu",
        "/usr/games",
        "/usr/gnu",

-       "/usr/local",
-       "/usr/local/bin",
-       "/usr/libexec",

        "/usr/include",
        "/usr/include",

-       "/usr/hosts",
-       "/usr/share", /*?*/
-       "/etc",
-#ifdef notdef
-       /* before reorg */
+       "/usr/libexec",
+       "/usr/sbin",
+       "/usr/share",
+       "/usr/X386/bin",
+       "/usr/local/bin",

        "/etc",
        "/etc",

-       "/bin",
-       "/usr/bin",
-       "/usr/games",
-       "/lib",
-       "/usr/ucb",
-       "/usr/lib",
-       "/usr/local",
-       "/usr/new",
-       "/usr/old",
-       "/usr/hosts",
-       "/usr/include",
-#endif

        0
 };
 /* This needs to be redone - man pages live with sources */
        0
 };
 /* This needs to be redone - man pages live with sources */


@@ -90,9 +71,22 @@ static char *mandirs[] = {
        "/usr/share/man/man6",
        "/usr/share/man/man7",
        "/usr/share/man/man8",
        "/usr/share/man/man6",
        "/usr/share/man/man7",
        "/usr/share/man/man8",

-       "/usr/share/man/manl",
-       "/usr/share/man/mann",
-       "/usr/share/man/mano",
+       "/usr/X386/man/man1",
+       "/usr/X386/man/man2",
+       "/usr/X386/man/man3",
+       "/usr/X386/man/man4",
+       "/usr/X386/man/man5",
+       "/usr/X386/man/man6",
+       "/usr/X386/man/man7",
+       "/usr/X386/man/man8",
+       "/usr/X386/man/cat1",
+       "/usr/X386/man/cat2",
+       "/usr/X386/man/cat3",
+       "/usr/X386/man/cat4",
+       "/usr/X386/man/cat5",
+       "/usr/X386/man/cat6",
+       "/usr/X386/man/cat7",
+       "/usr/X386/man/cat8",

        "/usr/local/man/man1",
        "/usr/local/man/man2",
        "/usr/local/man/man3",
        "/usr/local/man/man1",
        "/usr/local/man/man2",
        "/usr/local/man/man3",


@@ -101,57 +95,23 @@ static char *mandirs[] = {
        "/usr/local/man/man6",
        "/usr/local/man/man7",
        "/usr/local/man/man8",
        "/usr/local/man/man6",
        "/usr/local/man/man7",
        "/usr/local/man/man8",

-       "/usr/local/man/manl",
-       "/usr/local/man/mann",
-       "/usr/local/man/mano",

        0
 };
 static char *srcdirs[]  = {
        "/usr/src/bin",
        0
 };
 static char *srcdirs[]  = {
        "/usr/src/bin",

-       "/usr/src/sbin",
-       "/usr/src/etc",
-       "/usr/src/pgrm",
-       "/usr/src/usr.bin",
-       "/usr/src/usr.sbin",
-       "/usr/src/usr.ucb",
-       "/usr/src/usr.new",
-       "/usr/src/usr.lib",
-       "/usr/src/libexec",
-       "/usr/src/libdata",
-       "/usr/src/share",

        "/usr/src/contrib",
        "/usr/src/contrib",

-       "/usr/src/athena",
-       "/usr/src/devel",
-       "/usr/src/games",
-       "/usr/src/local",
-       "/usr/src/man",
-       "/usr/src/root",
-       "/usr/src/old",
-       "/usr/src/include",
-       "/usr/src/gnu",
-       /* still need libs */
-#ifdef notdef /* before reorg */
-       "/usr/src/bin",
-       "/usr/src/usr.bin",

        "/usr/src/etc",
        "/usr/src/etc",

-       "/usr/src/ucb",

        "/usr/src/games",
        "/usr/src/games",

-       "/usr/src/usr.lib",
-       "/usr/src/lib",
-       "/usr/src/local",
-       "/usr/src/new",
-       "/usr/src/old",
+       "/usr/src/gnu",

        "/usr/src/include",
        "/usr/src/include",

-       "/usr/src/lib/libc/gen",
-       "/usr/src/lib/libc/stdio",
-       "/usr/src/lib/libc/sys",
-       "/usr/src/lib/libc/net/common",
-       "/usr/src/lib/libc/net/inet",
-       "/usr/src/lib/libc/net/misc",
-       "/usr/src/ucb/pascal",
-       "/usr/src/ucb/pascal/utilities",
-       "/usr/src/undoc",
-#endif
+       "/usr/src/lib",
+       "/usr/src/libexec",
+       "/usr/src/sbin",
+       "/usr/src/share",
+       "/usr/src/usr.bin",
+       "/usr/src/usr.sbin",
+       "/usr/src/share/man",
+       "/usr/local/src",

        0
 };
 
        0
 };