diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | catman.c | 4 | ||||
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.local.example | 7 |
4 files changed, 15 insertions, 5 deletions
@@ -428,8 +428,10 @@ cgi-install: man.cgi catman-install: mandocd catman mkdir -p $(DESTDIR)$(SBINDIR) mkdir -p $(DESTDIR)$(MANDIR)/man8 - $(INSTALL_PROGRAM) mandocd catman $(DESTDIR)$(SBINDIR) - $(INSTALL_MAN) mandocd.8 catman.8 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_PROGRAM) mandocd $(DESTDIR)$(SBINDIR) + $(INSTALL_PROGRAM) catman $(DESTDIR)$(SBINDIR)/$(BINM_CATMAN) + $(INSTALL_MAN) mandocd.8 $(DESTDIR)$(MANDIR)/man8 + $(INSTALL_MAN) catman.8 $(DESTDIR)$(MANDIR)/man8/$(BINM_CATMAN).8 Makefile.local config.h: configure ${TESTSRCS} @echo "$@ is out of date; please run ./configure" @@ -258,7 +258,7 @@ main(int argc, char **argv) void usage(void) { - fprintf(stderr, "usage: catman [-I os=name] [-T output] " - "srcdir dstdir\n"); + fprintf(stderr, "usage: %s [-I os=name] [-T output] " + "srcdir dstdir\n", BINM_CATMAN); exit(1); } @@ -98,6 +98,7 @@ HTDOCDIR= CGIBINDIR= BINM_APROPOS="apropos" +BINM_CATMAN="catman" BINM_MAKEWHATIS="makewhatis" BINM_MAN="man" BINM_SOELIM="soelim" @@ -390,6 +391,7 @@ cat << __HEREDOC__ #define HAVE_OHASH ${HAVE_OHASH} #define BINM_APROPOS "${BINM_APROPOS}" +#define BINM_CATMAN "${BINM_CATMAN}" #define BINM_MAKEWHATIS "${BINM_MAKEWHATIS}" #define BINM_MAN "${BINM_MAN}" #define BINM_SOELIM "${BINM_SOELIM}" @@ -491,6 +493,7 @@ WWWPREFIX = ${WWWPREFIX} HTDOCDIR = ${HTDOCDIR} CGIBINDIR = ${CGIBINDIR} BINM_APROPOS = ${BINM_APROPOS} +BINM_CATMAN = ${BINM_CATMAN} BINM_MAKEWHATIS = ${BINM_MAKEWHATIS} BINM_MAN = ${BINM_MAN} BINM_SOELIM = ${BINM_SOELIM} diff --git a/configure.local.example b/configure.local.example index 98cf468e..c05e5cab 100644 --- a/configure.local.example +++ b/configure.local.example @@ -97,7 +97,7 @@ MANM_MANCONF="mandoc.conf" # default is "man.conf" # It is possible to set only one or a few of these variables, # there is no need to copy the whole block. -MANM_MAN="mandoc_man" # default is "man" +MANM_MAN="mandoc_man" # default is "catman" MANM_MDOC="mandoc_mdoc" # default is "mdoc" MANM_ROFF="mandoc_roff" # default is "roff" MANM_EQN="mandoc_eqn" # default is "eqn" @@ -227,6 +227,11 @@ CGIBINDIR="${WWWPREFIX}/cgi-bin" BUILD_CATMAN=1 +# Install catman(8) with a different name. +# See BINM_MAN above for details of how this works. + +BINM_CATMAN=mcatman # default is "man" + # --- settings that rarely need to be touched -------------------------- # Do not set these variables unless you really need to. |