===================================================================
RCS file: /cvs/mandoc/configure,v
retrieving revision 1.52
retrieving revision 1.54
diff -u -p -r1.52 -r1.54
--- mandoc/configure	2016/10/18 16:06:44	1.52
+++ mandoc/configure	2016/11/19 15:24:51	1.54
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Id: configure,v 1.52 2016/10/18 16:06:44 schwarze Exp $
+# $Id: configure,v 1.54 2016/11/19 15:24:51 schwarze Exp $
 #
 # Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@openbsd.org>
 #
@@ -47,6 +47,7 @@ LD_OHASH=
 STATIC="-static"
 
 BUILD_CGI=0
+INSTALL_LIBMANDOC=0
 
 HAVE_DIRENT_NAMLEN=
 HAVE_EFTYPE=
@@ -185,7 +186,7 @@ runtest() {
 # Select a UTF-8 locale.
 get_locale() {
 	[ -n "${HAVE_WCHAR}" ] && [ "${HAVE_WCHAR}" -eq 0 ] && return 0
-	ismanual UTF8_LOCALE UTF_LOCALE "$UTF8_LOCALE" && return 0
+	ismanual UTF8_LOCALE UTF8_LOCALE "$UTF8_LOCALE" && return 0
 	echo "UTF8_LOCALE: testing..." 1>&3
 	UTF8_LOCALE=`locale -a | grep -i '^en_US\.UTF-*8$' | head -n 1`
 	if [ -z "${UTF8_LOCALE}" ]; then
@@ -429,7 +430,8 @@ exec > Makefile.local
 BUILD_TARGETS=
 [ ${BUILD_CGI} -gt 0 ] && BUILD_TARGETS="cgi-build"
 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"
 
 cat << __HEREDOC__
 BUILD_TARGETS	= ${BUILD_TARGETS}