summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/man
diff options
context:
space:
mode:
authorru <ru@FreeBSD.org>2002-03-22 09:59:16 +0000
committerru <ru@FreeBSD.org>2002-03-22 09:59:16 +0000
commit73f0331a9f9fb96020ca6aae6e97e464d8adf8b3 (patch)
tree3c19bcd19eb8fa0a1cdba39238ce003c92819fa5 /gnu/usr.bin/man
parent6754aaaeed44f5f9417eed5e45459ee91c46d82e (diff)
downloadFreeBSD-src-73f0331a9f9fb96020ca6aae6e97e464d8adf8b3.zip
FreeBSD-src-73f0331a9f9fb96020ca6aae6e97e464d8adf8b3.tar.gz
Revision 1.45 of gnu/usr.bin/man/man.c obviated the need to link
manpages in machine-specific subdirectories (like man4/i386/) to "../". This change didn't propagate here resulting in a loss of whatis(1) database entries. Fix this. Reviewed by: tobez MFC after: 1 week
Diffstat (limited to 'gnu/usr.bin/man')
-rw-r--r--gnu/usr.bin/man/makewhatis/makewhatis.perl2
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/usr.bin/man/makewhatis/makewhatis.perl b/gnu/usr.bin/man/makewhatis/makewhatis.perl
index 2bb0e13..33cee65 100644
--- a/gnu/usr.bin/man/makewhatis/makewhatis.perl
+++ b/gnu/usr.bin/man/makewhatis/makewhatis.perl
@@ -180,6 +180,7 @@ sub parse_dir {
if ($subdir =~ /^man\w+$/) {
$subdir = "$dir/$subdir";
&parse_subdir($subdir);
+ &parse_subdir($subdir) if -d ($subdir .= "/${machine}");
}
}
closedir DIR
@@ -439,6 +440,7 @@ sub variables {
$whatis_name = "whatis"; # Default name for DB
$append = 0; # Don't delete old entries
$locale = 0; # Build DB only for localized man directories
+ chomp($machine = $ENV{'MACHINE'} || `uname -m`);
# choose localized man directories suffix.
$local_suffix = $ENV{'LC_ALL'} || $ENV{'LC_CTYPE'} || $ENV{'LANG'};
OpenPOWER on IntegriCloud