Parse the new man.conf(5) "output" directive.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index 9fc6c03388833ed41e7aaf101f3d20fccf94eac8..d2a5913593ad49a250a57903b245100a11074eaf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.452 2014/12/09 07:29:42 schwarze Exp $
+# $Id: Makefile,v 1.460 2015/03/27 17:37:25 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -15,12 +15,16 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+VERSION = 1.13.3
+
 # === LIST OF FILES ====================================================
 
 TESTSRCS        = test-dirent-namlen.c \
                   test-fgetln.c \
                   test-fts.c \
                   test-getsubopt.c \
+                  test-isblank.c \
+                  test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
                   test-reallocarray.c \
@@ -31,6 +35,8 @@ TESTSRCS       = test-dirent-namlen.c \
                   test-strlcpy.c \
                   test-strptime.c \
                   test-strsep.c \
+                  test-strtonum.c \
+                  test-vasprintf.c \
                   test-wchar.c
 
 SRCS            = att.c \
@@ -39,6 +45,8 @@ SRCS           = att.c \
                   compat_fgetln.c \
                   compat_fts.c \
                   compat_getsubopt.c \
+                  compat_isblank.c \
+                  compat_mkdtemp.c \
                   compat_ohash.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
@@ -46,6 +54,8 @@ SRCS           = att.c \
                   compat_strlcat.c \
                   compat_strlcpy.c \
                   compat_strsep.c \
+                  compat_strtonum.c \
+                  compat_vasprintf.c \
                   demandoc.c \
                   eqn.c \
                   eqn_html.c \
@@ -121,7 +131,9 @@ DISTFILES    = INSTALL \
                   man.1 \
                   man.7 \
                   man.cgi.8 \
+                  man.conf.5 \
                   man.h \
+                  manconf.h \
                   mandoc.1 \
                   mandoc.3 \
                   mandoc.db.5 \
@@ -132,7 +144,6 @@ DISTFILES    = INSTALL \
                   mandoc_headers.3 \
                   mandoc_html.3 \
                   mandoc_malloc.3 \
-                  manpath.h \
                   mansearch.3 \
                   mansearch.h \
                   mchars_alloc.3 \
@@ -183,13 +194,17 @@ LIBMANDOC_OBJS     = $(LIBMAN_OBJS) \
 COMPAT_OBJS     = compat_fgetln.o \
                   compat_fts.o \
                   compat_getsubopt.o \
+                  compat_isblank.o \
+                  compat_mkdtemp.o \
                   compat_ohash.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
                   compat_strlcat.o \
                   compat_strlcpy.o \
-                  compat_strsep.o
+                  compat_strsep.o \
+                  compat_strtonum.o \
+                  compat_vasprintf.o
 
 MANDOC_HTML_OBJS = eqn_html.o \
                   html.o \
@@ -211,6 +226,7 @@ BASE_OBJS    = $(MANDOC_HTML_OBJS) \
                   $(MANDOC_MAN_OBJS) \
                   $(MANDOC_TERM_OBJS) \
                   main.o \
+                  manpath.o \
                   out.o \
                   tree.o
 
@@ -218,8 +234,7 @@ MAIN_OBJS    = $(BASE_OBJS)
 
 DB_OBJS                 = mandocdb.o \
                   mansearch.o \
-                  mansearch_const.o \
-                  manpath.o
+                  mansearch_const.o
 
 CGI_OBJS        = $(MANDOC_HTML_OBJS) \
                   cgi.o \
@@ -243,6 +258,7 @@ WWW_MANS     = apropos.1.html \
                   mansearch.3.html \
                   mchars_alloc.3.html \
                   tbl.3.html \
+                  man.conf.5.html \
                   mandoc.db.5.html \
                   eqn.7.html \
                   man.7.html \
@@ -253,9 +269,9 @@ WWW_MANS     = apropos.1.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
                   man.h.html \
+                  manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
-                  manpath.h.html \
                   mansearch.h.html \
                   mdoc.h.html
 
@@ -306,16 +322,24 @@ base-install: base-build
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
+       mkdir -p $(DESTDIR)$(MANDIR)/man5
        mkdir -p $(DESTDIR)$(MANDIR)/man7
        $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h \
                $(DESTDIR)$(INCLUDEDIR)
        $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
+       $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
        $(INSTALL_MAN) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3
-       $(INSTALL_MAN) man.7 mdoc.7 roff.7 eqn.7 tbl.7 mandoc_char.7 \
-               $(DESTDIR)$(MANDIR)/man7
+       $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/${MANM_MANCONF}.5
+       $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MAN}.7
+       $(INSTALL_MAN) mdoc.7 $(DESTDIR)$(MANDIR)/man7/${MANM_MDOC}.7
+       $(INSTALL_MAN) roff.7 $(DESTDIR)$(MANDIR)/man7/${MANM_ROFF}.7
+       $(INSTALL_MAN) eqn.7 $(DESTDIR)$(MANDIR)/man7/${MANM_EQN}.7
+       $(INSTALL_MAN) tbl.7 $(DESTDIR)$(MANDIR)/man7/${MANM_TBL}.7
+       $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7
        $(INSTALL_DATA) example.style.css $(DESTDIR)$(EXAMPLEDIR)
 
 db-install: base-build
@@ -325,16 +349,17 @@ db-install: base-build
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man5
        mkdir -p $(DESTDIR)$(MANDIR)/man8
-       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/apropos
-       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/man
-       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/whatis
-       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(SBINDIR)/makewhatis
-       $(INSTALL_MAN) apropos.1 man.1 $(DESTDIR)$(MANDIR)/man1
-       ln -f $(DESTDIR)$(MANDIR)/man1/apropos.1 \
-               $(DESTDIR)$(MANDIR)/man1/whatis.1
+       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
+       ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
+       ln -f $(DESTDIR)$(BINDIR)/mandoc \
+               $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+       $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
+       ln -f $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
+               $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
        $(INSTALL_MAN) mansearch.3 $(DESTDIR)$(MANDIR)/man3
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
-       $(INSTALL_MAN) makewhatis.8 $(DESTDIR)$(MANDIR)/man8
+       $(INSTALL_MAN) makewhatis.8 \
+               $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8
 
 cgi-install: cgi-build
        mkdir -p $(DESTDIR)$(CGIBINDIR)