Provide a variable BINM_CATMAN.

Suggested by Michael <Stapelberg@debian.org>.

4 files changed, 19 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 27d682ac..7b9bc68f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.499 2017/02/08 16:11:40 schwarze Exp $
+# $Id: Makefile,v 1.500 2017/02/16 15:12:32 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -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"
diff --git a/catman.c b/catman.c
index a17657fb..3cfb1038 100644
--- a/catman.c
+++ b/catman.c
@@ -1,4 +1,4 @@
-/*	$Id: catman.c,v 1.18 2017/02/09 20:53:33 schwarze Exp $ */
+/*	$Id: catman.c,v 1.19 2017/02/16 15:12:32 schwarze Exp $ */
 /*
  * Copyright (c) 2017 Michael Stapelberg <stapelberg@debian.org>
  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -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);
 }
diff --git a/configure b/configure
index bb3a7357..93f44a90 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: configure,v 1.57 2017/02/08 16:11:41 schwarze Exp $
+# $Id: configure,v 1.58 2017/02/16 15:12:32 schwarze Exp $
 #
 # Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -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 2f0a2b08..8f1168b3 100644
--- a/configure.local.example
+++ b/configure.local.example
@@ -1,4 +1,4 @@
-# $Id: configure.local.example,v 1.25 2017/02/08 16:16:08 schwarze Exp $
+# $Id: configure.local.example,v 1.26 2017/02/16 15:12:32 schwarze Exp $
 #
 # Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -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.