diff options
Diffstat (limited to 'meta/recipes-extended/man/man/man-1.6e-whatis2.patch')
-rw-r--r-- | meta/recipes-extended/man/man/man-1.6e-whatis2.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-extended/man/man/man-1.6e-whatis2.patch b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch new file mode 100644 index 0000000000..7f013836c0 --- /dev/null +++ b/meta/recipes-extended/man/man/man-1.6e-whatis2.patch | |||
@@ -0,0 +1,52 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
4 | |||
5 | Index: man-1.6f/src/makewhatis.sh | ||
6 | =================================================================== | ||
7 | --- man-1.6f.orig/src/makewhatis.sh 2010-12-29 13:51:45.000000000 -0800 | ||
8 | +++ man-1.6f/src/makewhatis.sh 2010-12-29 13:59:35.399799412 -0800 | ||
9 | @@ -164,10 +164,15 @@ | ||
10 | fi | ||
11 | catpath=`echo ${catpath} | tr : ' '` | ||
12 | |||
13 | +#WHATIS_DIR=$DESTDIR/var/cache/man/`echo $here|sed -e 's!.*/man/!!g'` | ||
14 | +WHATIS_DIR=$DESTDIR/var/cache/man/$LANG | ||
15 | +[[ -d $WHATIS_DIR ]] || mkdir -p $WHATIS_DIR/ | ||
16 | + | ||
17 | # first truncate all the whatis files that will be created new, | ||
18 | # then only update - we might visit the same directory twice | ||
19 | if [ x$update = x ]; then | ||
20 | - cp /dev/null /var/cache/man/whatis | ||
21 | + mkdir -p $WHATIS_DIR/ | ||
22 | + /bin/echo -n > $WHATIS_DIR/whatis | ||
23 | fi | ||
24 | |||
25 | for pages in man cat | ||
26 | @@ -180,13 +185,7 @@ | ||
27 | echo "about to enter $mandir" > /dev/stderr | ||
28 | fi | ||
29 | |||
30 | - # kludge for Slackware's /usr/man/preformat | ||
31 | - if [ $mandir = /usr/man/preformat ] | ||
32 | - then | ||
33 | - mandir1=/usr/man | ||
34 | - else | ||
35 | - mandir1=$mandir | ||
36 | - fi | ||
37 | + mandir1=$WHATIS_DIR | ||
38 | |||
39 | # if $mandir is on a readonly partition, and the whatis file | ||
40 | # is not a symlink, then let's skip trying to update it | ||
41 | @@ -207,11 +206,6 @@ | ||
42 | fi | ||
43 | fi | ||
44 | |||
45 | - if [ -s ${mandir}/whatis -a $pages = man -a x$update = x ]; then | ||
46 | - if [ x$verbose != x ]; then | ||
47 | - echo skipping $mandir - we did it already > /dev/stderr | ||
48 | - fi | ||
49 | - else | ||
50 | here=`pwd` | ||
51 | cd $mandir | ||
52 | for i in $sections | ||