Subject: Re: RFE: "make install" doesn't check for existance of target directory
To: None <current-users@sun-lamp.cs.berkeley.edu>
From: None <JUENGST@saph2.physik.uni-bonn.de>
List: current-users
Date: 03/29/1994 22:15:37
> > Would it be too much to ask to have the "make
> >install" target check to make sure that the target directory exists first, and
> >to create it if it doesn't exist?
>
> yes. use 'mtree' and the mtree configuration files to create a
> directory tree. see the example use in /usr/src/etc/Makefile.
>
>
> cgd
I think it is a good question to ask why make install doesn't create
required target directories. I think it should. Just have a look into
your system and try to find the MAKEDEV.0 manual pages file for the amiga.
Some (most?) people will find a file called /usr/share/man/cat8/amiga
instead of /usr/share/man/cat8/amiga/MAKEDEV.0. In my opinion it's a bad
idea to use mtree configuration files to create required directories,
especially if these mtree configuration files don't exist. Chris, do you
realy think that people like to use BSD make if they have to handle
additional mtree configuration files? I don't think so. The MIT X11 imake
does create the required subdirectories and that's fine.
I sent you (Chris) patches which do create the required directories for
manual pages and the neccessary patches to created gzipped manual pages
via make install. Last, but not least I sent you (Chris) patches which
do remove the special rules in the Makefiles of ar, crontab, disklabel
and ranlib, which are required to build the additional manual pages files
(these programs do have two man files). And I sent you (Chris) patches
to add an -v option for man, because I don't want to see always the
"Formatting..." messages, even if it doesn't format anything. You wrote
that tbe patches for the new directories problem are *WRONG*, because
one should use mtree. I don't agree. And you wrote that gzipped manual
pages shouldn't be the default. I don't agree, because I don't know why I
should waste my hard disc resources for things which I just need once
a month. You didn't like the -v option, because you think that user
should be informed as default, if there's a time consuming process in
progress. Well, I don't know what kind of computer you use, but on every
system I know the gunzip does its job in less than a second to uncompress
a manual page file.
For people who like to have gzipped manual pages (including the mkdir
statement which creates required subdirectories for the manual pages),
here they are (based on NetBSD-current 19-Mar-1994). At the beginning
there are four small shell scripts which will create new subdirectories.
Call them before you use patch. At the end are the patches for the man
-v option. If you want to have gzipped manual pages (and their
directories;-) you have to use every script file and patch (excluding
the -v patches at the end).
Henry
----------------------------------------------------------------------------
#!/bin/sh
cd /usr/src/usr.bin/ar
rm -rf man5
mkdir man5
mv ar.5.5 man5/ar.5
----------------------------------------------------------------------------
#!/bin/sh
cd /usr/src/usr.bin/crontab
for i in 1 5
do
(rm -rf man$i ; mkdir man$i ; cd man$i ;\
ln -s ../../../libexec/cron/crontab.$i crontab.$i )
done
#why are these manual pages in src/libexec/cron ?
----------------------------------------------------------------------------
#!/bin/sh
cd /usr/src/usr.bin/ranlib
rm -rf man5
mkdir man5
mv ranlib.5.5 man5/ranlib.5
----------------------------------------------------------------------------
#!/bin/sh
cd /usr/src/sbin/disklabel
rm -rf man5
mkdir man5
mv disklabel.5.5 man5/disklabel.5
----------------------------------------------------------------------------
*** /usr/src/share/mk/bsd.man.mk.orig Thu Feb 10 12:12:21 1994
--- /usr/src/share/mk/bsd.man.mk Wed Mar 9 12:54:07 1994
***************
*** 16,77 ****
@nroff -mandoc ${.IMPSRC} > ${.TARGET} || ( rm -f ${.TARGET} ; false )
! MINSTALL= install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
maninstall:
.if defined(MAN1) && !empty(MAN1)
MANALL+=${MAN1}
maninstall: man1install
man1install:
${MINSTALL} ${MAN1} ${DESTDIR}${MANDIR}1${MANSUBDIR}
.endif
.if defined(MAN2) && !empty(MAN2)
MANALL+=${MAN2}
maninstall: man2install
man2install:
${MINSTALL} ${MAN2} ${DESTDIR}${MANDIR}2${MANSUBDIR}
.endif
.if defined(MAN3) && !empty(MAN3)
MANALL+=${MAN3}
maninstall: man3install
man3install:
${MINSTALL} ${MAN3} ${DESTDIR}${MANDIR}3${MANSUBDIR}
.endif
.if defined(MAN3F) && !empty(MAN3F)
MANALL+=${MAN3F}
maninstall: man3finstall
man3finstall:
${MINSTALL} ${MAN3F} ${DESTDIR}${MANDIR}3f${MANSUBDIR}
.endif
.if defined(MAN4) && !empty(MAN4)
MANALL+=${MAN4}
maninstall: man4install
man4install:
${MINSTALL} ${MAN4} ${DESTDIR}${MANDIR}4${MANSUBDIR}
.endif
.if defined(MAN5) && !empty(MAN5)
MANALL+=${MAN5}
maninstall: man5install
man5install:
${MINSTALL} ${MAN5} ${DESTDIR}${MANDIR}5${MANSUBDIR}
.endif
.if defined(MAN6) && !empty(MAN6)
MANALL+=${MAN6}
maninstall: man6install
man6install:
${MINSTALL} ${MAN6} ${DESTDIR}${MANDIR}6${MANSUBDIR}
.endif
.if defined(MAN7) && !empty(MAN7)
MANALL+=${MAN7}
maninstall: man7install
man7install:
${MINSTALL} ${MAN7} ${DESTDIR}${MANDIR}7${MANSUBDIR}
.endif
.if defined(MAN8) && !empty(MAN8)
MANALL+=${MAN8}
maninstall: man8install
man8install:
${MINSTALL} ${MAN8} ${DESTDIR}${MANDIR}8${MANSUBDIR}
.endif
.if defined(MLINKS) && !empty(MLINKS)
maninstall: manlinkinstall
--- 16,123 ----
@nroff -mandoc ${.IMPSRC} > ${.TARGET} || ( rm -f ${.TARGET} ; false )
! MINSTALL=install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE}
! MINSTALLDIR=install -d -m ${MANDIRMODE} -o ${MANOWN} -g ${MANGRP}
maninstall:
.if defined(MAN1) && !empty(MAN1)
MANALL+=${MAN1}
maninstall: man1install
man1install:
+ @if [ ! -d ${DESTDIR}${MANDIR}1${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}1${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}1${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN1} ${DESTDIR}${MANDIR}1${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}1${MANSUBDIR} ; gzip -f -9 ${MAN1})
.endif
.if defined(MAN2) && !empty(MAN2)
MANALL+=${MAN2}
maninstall: man2install
man2install:
+ @if [ ! -d ${DESTDIR}${MANDIR}2${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}2${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}2${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN2} ${DESTDIR}${MANDIR}2${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}2${MANSUBDIR} ; gzip -f -9 ${MAN2})
.endif
.if defined(MAN3) && !empty(MAN3)
MANALL+=${MAN3}
maninstall: man3install
man3install:
+ @if [ ! -d ${DESTDIR}${MANDIR}3${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}3${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}3${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN3} ${DESTDIR}${MANDIR}3${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}3${MANSUBDIR} ; gzip -f -9 ${MAN3})
.endif
.if defined(MAN3F) && !empty(MAN3F)
MANALL+=${MAN3F}
maninstall: man3finstall
man3finstall:
+ @if [ ! -d ${DESTDIR}${MANDIR}3f${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}3f${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}3f${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN3F} ${DESTDIR}${MANDIR}3f${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}3f${MANSUBDIR} ; gzip -f -9 ${MAN3F})
.endif
.if defined(MAN4) && !empty(MAN4)
MANALL+=${MAN4}
maninstall: man4install
man4install:
+ @if [ ! -d ${DESTDIR}${MANDIR}4${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}4${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}4${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN4} ${DESTDIR}${MANDIR}4${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}4${MANSUBDIR} ; gzip -f -9 ${MAN4})
.endif
.if defined(MAN5) && !empty(MAN5)
MANALL+=${MAN5}
maninstall: man5install
man5install:
+ @if [ ! -d ${DESTDIR}${MANDIR}5${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}5${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}5${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN5} ${DESTDIR}${MANDIR}5${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}5${MANSUBDIR} ; gzip -f -9 ${MAN5})
.endif
.if defined(MAN6) && !empty(MAN6)
MANALL+=${MAN6}
maninstall: man6install
man6install:
+ @if [ ! -d ${DESTDIR}${MANDIR}6${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}6${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}6${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN6} ${DESTDIR}${MANDIR}6${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}6${MANSUBDIR} ; gzip -f -9 ${MAN6})
.endif
.if defined(MAN7) && !empty(MAN7)
MANALL+=${MAN7}
maninstall: man7install
man7install:
+ @if [ ! -d ${DESTDIR}${MANDIR}7${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}7${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}7${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN7} ${DESTDIR}${MANDIR}7${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}7${MANSUBDIR} ; gzip -f -9 ${MAN7})
.endif
.if defined(MAN8) && !empty(MAN8)
MANALL+=${MAN8}
maninstall: man8install
man8install:
+ @if [ ! -d ${DESTDIR}${MANDIR}8${MANSUBDIR} ] ; then \
+ rm -f ${DESTDIR}${MANDIR}8${MANSUBDIR} ; \
+ ${MINSTALLDIR} ${DESTDIR}${MANDIR}8${MANSUBDIR} ; \
+ fi
${MINSTALL} ${MAN8} ${DESTDIR}${MANDIR}8${MANSUBDIR}
+ (cd ${DESTDIR}${MANDIR}8${MANSUBDIR} ; gzip -f -9 ${MAN8})
.endif
.if defined(MLINKS) && !empty(MLINKS)
maninstall: manlinkinstall
***************
*** 86,94 ****
shift; \
dir=${DESTDIR}${MANDIR}`expr $$name : '.*\.\(.*\)'`; \
t=$${dir}${MANSUBDIR}/`expr $$name : '\(.*\)\..*'`.0; \
echo $$t -\> $$l; \
! rm -f $$t; \
! ln $$l $$t; \
done; true
.endif
--- 132,145 ----
shift; \
dir=${DESTDIR}${MANDIR}`expr $$name : '.*\.\(.*\)'`; \
t=$${dir}${MANSUBDIR}/`expr $$name : '\(.*\)\..*'`.0; \
+ dir=`dirname $$t` ; \
+ if [ ! -d $${dir} ] ; then \
+ rm -f $${dir} ; \
+ ${MINSTALLDIR} $${dir} ; \
+ fi; \
echo $$t -\> $$l; \
! rm -f $${t} $${t}.gz; \
! ln -s $${l}.gz $${t}.gz; \
done; true
.endif
*** /usr/src/share/mk/bsd.README.orig Fri Jan 28 11:47:38 1994
--- /usr/src/share/mk/bsd.README Wed Mar 9 12:20:55 1994
***************
*** 83,88 ****
--- 83,90 ----
MANMODE Manual mode.
+ MANDIRMODE Manual directory mode.
+
MANSUBDIR Subdirectory under the manual page section, i.e. "/vax"
or "/tahoe" for machine specific manual pages.
*** /usr/src/share/mk/bsd.own.mk.orig Thu Jan 20 11:20:53 1994
--- /usr/src/share/mk/bsd.own.mk Wed Mar 9 12:18:10 1994
***************
*** 6,11 ****
--- 6,13 ----
BSDSRCDIR?= /usr/src
BSDOBJDIR?= /usr/obj
+ BSDDIRMODE?= 755
+
BINGRP?= bin
BINOWN?= bin
BINMODE?= 555
***************
*** 15,20 ****
--- 17,23 ----
MANGRP?= bin
MANOWN?= bin
MANMODE?= ${NONBINMODE}
+ MANDIRMODE?= ${BSDDIRMODE}
LIBDIR?= /usr/lib
LINTLIBDIR?= /usr/libdata/lint
----------------------------------------------------------------------------
*** /usr/src/usr.bin/ar/Makefile.orig Fri Dec 17 08:04:36 1993
--- /usr/src/usr.bin/ar/Makefile Mon Jan 17 19:14:06 1994
***************
*** 5,19 ****
CFLAGS+=-I${.CURDIR}
SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \
move.c print.c replace.c
! MAN1= ar.0
! CLEANFILES=ar.5.0
!
! ar.0: ar.5.0
!
! .if !defined(NOMAN)
! afterinstall:
! install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ar.5.0 \
! ${DESTDIR}${MANDIR}5/ar.0
! .endif
.include <bsd.prog.mk>
--- 5,10 ----
CFLAGS+=-I${.CURDIR}
SRCS= append.c ar.c archive.c contents.c delete.c extract.c misc.c \
move.c print.c replace.c
! SUBDIR=man5
.include <bsd.prog.mk>
*** /dev/null Mon Jan 17 18:56:51 1994
--- /usr/src/usr.bin/ar/man5/Makefile Mon Jan 17 19:18:08 1994
***************
*** 0 ****
--- 1,3 ----
+ MAN5=ar.0
+
+ .include <bsd.prog.mk>
----------------------------------------------------------------------------
*** /dev/null Mon Feb 21 22:28:22 1994
--- /usr/src/usr.bin/crontab/man1/Makefile Mon Feb 21 22:41:36 1994
***************
*** 0 ****
--- 1,3 ----
+ MAN1=crontab.0
+
+ .include <bsd.prog.mk>
*** /usr/src/usr.bin/crontab/Makefile.dist Thu Feb 10 12:18:54 1994
--- /usr/src/usr.bin/crontab/Makefile Mon Feb 21 22:26:02 1994
***************
*** 5,27 ****
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../usr.sbin/cron -DDEBUGGING=1
BINOWN =root
BINMODE=4111
! MAN1=
! MAN5=
! CLEANFILES=crontab.1.0 crontab.5.0
!
! .if !defined(NOMAN)
! all: crontab.1.0 crontab.5.0
!
! crontab.1.0: crontab.1
! nroff -mandoc ${.ALLSRC} > ${.TARGET}
!
! crontab.5.0: crontab.5
! nroff -mandoc ${.ALLSRC} > ${.TARGET}
!
! maninstall:
! ${MINSTALL} crontab.1.0 ${DESTDIR}${MANDIR}1/crontab.0
! ${MINSTALL} crontab.5.0 ${DESTDIR}${MANDIR}5/crontab.0
! .endif
.include <bsd.prog.mk>
.PATH: ${.CURDIR}/../../usr.sbin/cron
--- 5,12 ----
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../../usr.sbin/cron -DDEBUGGING=1
BINOWN =root
BINMODE=4111
! MANOWN=bin
! SUBDIR=man1 man5
.include <bsd.prog.mk>
.PATH: ${.CURDIR}/../../usr.sbin/cron
*** /dev/null Mon Feb 21 22:28:22 1994
--- /usr/src/usr.bin/crontab/man5/Makefile Mon Feb 21 22:46:29 1994
***************
*** 0 ****
--- 1,3 ----
+ MAN5=crontab.0
+
+ .include <bsd.prog.mk>
----------------------------------------------------------------------------
*** /dev/null Mon Jan 17 19:28:48 1994
--- /usr/src/usr.bin/ranlib/man5/Makefile Mon Jan 17 19:34:25 1994
***************
*** 0 ****
--- 1,3 ----
+ MAN5=ranlib.0
+
+ .include <bsd.prog.mk>
*** /usr/src/usr.bin/ranlib/Makefile.orig Fri Dec 17 08:16:33 1993
--- /usr/src/usr.bin/ranlib/Makefile Mon Jan 17 19:32:45 1994
***************
*** 4,19 ****
PROG= ranlib
SRCS= archive.c build.c misc.c ranlib.c touch.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar
- MAN1= ranlib.0
VPATH= ${.CURDIR}/../ar
! CLEANFILES=ranlib.5.0
!
! ranlib.0: ranlib.5.0
!
! .if !defined(NOMAN)
! afterinstall:
! install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} ranlib.5.0 \
! ${DESTDIR}${MANDIR}5/ranlib.0
! .endif
.include <bsd.prog.mk>
--- 4,10 ----
PROG= ranlib
SRCS= archive.c build.c misc.c ranlib.c touch.c
CFLAGS+=-I${.CURDIR} -I${.CURDIR}/../ar
VPATH= ${.CURDIR}/../ar
! SUBDIR=man5
.include <bsd.prog.mk>
----------------------------------------------------------------------------
*** /dev/null Mon Jan 17 18:56:51 1994
--- /usr/src/sbin/disklabel/man5/Makefile Mon Jan 17 19:27:35 1994
***************
*** 0 ****
--- 1,3 ----
+ MAN5=disklabel.0
+
+ .include <bsd.prog.mk>
*** /usr/src/sbin/disklabel/Makefile.orig Sun Feb 13 11:11:31 1994
--- /usr/src/sbin/disklabel/Makefile Mon Feb 21 23:11:58 1994
***************
*** 6,32 ****
MAN8= disklabel.0
BINGRP=operator
BINMODE=2550
! CLEANFILES=disklabel.5.0
.if (${MACHINE} == "amiga")
CFLAGS+=-D${MACHINE}
- .endif
-
- .if !defined(NOMAN)
- all: disklabel.5.0
- .endif
-
- beforeinstall:
- @if [ ! -d ${DESTDIR}${MANDIR}5 ]; then \
- /bin/rm -f ${DESTDIR}${MANDIR}5 ; \
- mkdir -p ${DESTDIR}${MANDIR}5 ; \
- chown root.wheel ${DESTDIR}${MANDIR}5 ; \
- chmod 755 ${DESTDIR}${MANDIR}5 ; \
- else \
- true ; \
- fi
- .if !defined(NOMAN)
- install ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} disklabel.5.0 \
- ${DESTDIR}${MANDIR}5/disklabel.0
.endif
.include <bsd.prog.mk>
--- 6,15 ----
MAN8= disklabel.0
BINGRP=operator
BINMODE=2550
! MANGRP=bin
! SUBDIR=man5
.if (${MACHINE} == "amiga")
CFLAGS+=-D${MACHINE}
.endif
.include <bsd.prog.mk>
============================================================================
Patches to add the -v option for man:
----------------------------------------------------------------------------
*** /dev/null Mon Feb 21 19:07:12 1994
--- man_def.h Mon Feb 21 20:55:31 1994
***************
*** 0 ****
--- 1,22 ----
+ #ifndef _MAN_DEF_H
+ # define _MAN_DEF_H
+
+
+ # ifndef MAN_DEF_FALSE
+ # ifdef FALSE
+ # define MAN_DEF_FALSE FALSE
+ # else /* not FALSE */
+ # define MAN_DEF_FALSE 0
+ # endif /* not FALSE */
+ # endif /* not MAN_DEF_FALSE */
+
+ # ifndef MAN_DEF_TRUE
+ # ifdef TRUE
+ # define MAN_DEF_TRUE TRUE
+ # else /* not TRUE */
+ # define MAN_DEF_TRUE (!MAN_DEF_FALSE)
+ # endif /* not TRUE */
+ # endif /* not MAN_DEF_TRUE */
+
+
+ #endif /* not _MAN_DEF_H */
*** /dev/null Mon Feb 21 19:07:12 1994
--- man_var.h Mon Feb 21 20:57:01 1994
***************
*** 0 ****
--- 1,12 ----
+ #ifndef _MAN_VAR_H
+ # define _MAN_VAR_H
+
+
+ # ifndef MAN_VAR_EXTERNAL /* Should only be defined in the man.c file ! */
+ # define MAN_VAR_EXTERNAL external
+ # endif /* not MAN_VAR_EXTERNAL */
+
+
+ MAN_VAR_EXTERNAL int man_var_flag_verbose;
+
+ #endif /* not _MAN_VAR_H */
*** /usr/src/usr.bin/man/man.1.dist Tue Dec 21 03:59:31 1993
--- /usr/src/usr.bin/man/man.1 Mon Feb 21 21:21:32 1994
***************
*** 39,45 ****
.Nd display the on-line manual pages
.Sh SYNOPSIS
.Nm man
! .Op Fl achw
.Op Fl C Ar file
.Op Fl M Ar path
.Op Fl m Ar path
--- 39,45 ----
.Nd display the on-line manual pages
.Sh SYNOPSIS
.Nm man
! .Op Fl achvw
.Op Fl C Ar file
.Op Fl M Ar path
.Op Fl m Ar path
***************
*** 110,115 ****
--- 110,117 ----
is specified by the ``_subdir'' line in the
.Nm man
configuration file.
+ .It Fl v
+ Verbosely list all actions in progress.
.It Fl w
List the pathnames of the manual pages which
.Nm man
*** /usr/src/usr.bin/man/man.c.dist Tue Dec 21 03:59:33 1993
--- /usr/src/usr.bin/man/man.c Mon Feb 21 21:20:27 1994
***************
*** 59,64 ****
--- 59,69 ----
#include "config.h"
#include "pathnames.h"
+ #include "man_def.h"
+ #define MAN_VAR_EXTERNAL /* nothing ! */
+ #include "man_var.h"
+
+
int f_all, f_where;
static void build_page __P((char *, char **));
***************
*** 86,94 ****
char **ap, *cmd, *machine, *p, *p_add, *p_path, *pager, *slashp;
char *conffile, buf[MAXPATHLEN * 2];
f_cat = f_how = 0;
conffile = p_add = p_path = NULL;
! while ((ch = getopt(argc, argv, "-aC:cfhkM:m:P:w")) != EOF)
switch (ch) {
case 'a':
f_all = 1;
--- 91,101 ----
char **ap, *cmd, *machine, *p, *p_add, *p_path, *pager, *slashp;
char *conffile, buf[MAXPATHLEN * 2];
+ man_var_flag_verbose=MAN_DEF_FALSE;
+
f_cat = f_how = 0;
conffile = p_add = p_path = NULL;
! while ((ch = getopt(argc, argv, "-vaC:cfhkM:m:P:w")) != EOF)
switch (ch) {
case 'a':
f_all = 1;
***************
*** 120,125 ****
--- 127,135 ----
case 'k':
jump(argv, "-k", "apropos");
/* NOTREACHED */
+ case 'v':
+ man_var_flag_verbose=MAN_DEF_TRUE;
+ break;
case 'w':
f_all = f_where = 1;
break;
***************
*** 489,495 ****
/* Let the user know this may take awhile. */
if (!warned) {
warned = 1;
! warnx("Formatting manual page...");
}
/* Add a remove-when-done list. */
--- 499,506 ----
/* Let the user know this may take awhile. */
if (!warned) {
warned = 1;
! if(man_var_flag_verbose)
! warnx("Formatting manual page...");
}
/* Add a remove-when-done list. */
***************
*** 707,712 ****
usage()
{
(void)fprintf(stderr,
! "usage: man [-ac] [-C file] [-M path] [-m path] [section] title ...\n");
exit(1);
}
--- 718,723 ----
usage()
{
(void)fprintf(stderr,
! "usage: man [-ac] [-v] [-C file] [-M path] [-m path] [section] title ...\n");
exit(1);
}
--
juengst@saph2.physik.uni-bonn.de [131.220.221.12] (internet)
juengst@boss1.physik.uni-bonn.de [131.220.221.30]
saph2::juengst [13.259] (decnet)
Any opinions in this mail are my own.
------------------------------------------------------------------------------