===================================================================
RCS file: /cvs/mandoc/configure,v
retrieving revision 1.53
retrieving revision 1.56
diff -u -p -r1.53 -r1.56
--- mandoc/configure	2016/10/20 18:47:49	1.53
+++ mandoc/configure	2017/02/04 12:03:07	1.56
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: configure,v 1.53 2016/10/20 18:47:49 schwarze Exp $
+# $Id: configure,v 1.56 2017/02/04 12:03:07 schwarze Exp $
 #
 # Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -47,6 +47,8 @@ LD_OHASH=
 STATIC="-static"
 
 BUILD_CGI=0
+BUILD_CATMAN=0
+INSTALL_LIBMANDOC=0
 
 HAVE_DIRENT_NAMLEN=
 HAVE_EFTYPE=
@@ -144,10 +146,10 @@ ismanual() {
 singletest() {
 	cat 1>&3 << __HEREDOC__
 ${1}${3}: testing...
-${COMP} ${3} -o test-${1} test-${1}.c
+${COMP} -o test-${1} test-${1}.c ${3}
 __HEREDOC__
 
-	if ${COMP} ${3} -o "test-${1}" "test-${1}.c" 1>&3 2>&3; then
+	if ${COMP} -o "test-${1}" "test-${1}.c" ${3} 1>&3 2>&3; then
 		echo "${1}${3}: ${CC} succeeded" 1>&3
 	else
 		echo "${1}${3}: ${CC} failed with $?" 1>&3
@@ -427,9 +429,14 @@ exec > Makefile.local
 [ -z "${INSTALL_DATA}"    ] && INSTALL_DATA="${INSTALL} -m 0444"
 
 BUILD_TARGETS=
-[ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="cgi-build"
+[ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="man.cgi"
+[ ${BUILD_CATMAN} -gt 0 ] && \
+	BUILD_TARGETS="${BUILD_TARGETS} mandocd catman"
 INSTALL_TARGETS=
-[ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="cgi-install"
+[ ${INSTALL_LIBMANDOC} -gt 0 ] && INSTALL_TARGETS="lib-install"
+[ ${BUILD_CGI} -gt 0 ] && INSTALL_TARGETS="${INSTALL_TARGETS} cgi-install"
+[ ${BUILD_CATMAN} -gt 0 ] && \
+	INSTALL_TARGETS="${INSTALL_TARGETS} catman-install"
 
 cat << __HEREDOC__
 BUILD_TARGETS	= ${BUILD_TARGETS}