Improve POSIX compliance by making case-insensitive extended

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index a9626643eaf908576d98db470257b0b4babf7951..e5661c423b94e0815c0148c5191428909280d4f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
-# $Id: Makefile,v 1.518 2018/02/27 11:16:23 schwarze Exp $
+# $Id: Makefile,v 1.520 2018/08/09 17:28:23 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
-# Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
+# Copyright (c) 2011, 2013-2018 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,7 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-VERSION = 1.14.3
+VERSION = 1.14.4
 
 # === LIST OF FILES ====================================================
 
@@ -30,6 +30,7 @@ TESTSRCS       = test-be32toh.c \
                   test-isblank.c \
                   test-mkdtemp.c \
                   test-nanosleep.c \
+                  test-noop.c \
                   test-ntohl.c \
                   test-O_DIRECTORY.c \
                   test-ohash.c \
@@ -319,6 +320,7 @@ SOELIM_OBJS  = soelim.o \
 WWW_MANS        = apropos.1.html \
                   demandoc.1.html \
                   man.1.html \
+                  man.options.1.html \
                   mandoc.1.html \
                   soelim.1.html \
                   man.cgi.3.html \
@@ -335,14 +337,15 @@ WWW_MANS   = apropos.1.html \
                   eqn.7.html \
                   man.7.html \
                   mandoc_char.7.html \
-                  mandocd.8.html \
                   mdoc.7.html \
                   roff.7.html \
                   tbl.7.html \
                   catman.8.html \
                   makewhatis.8.html \
                   man.cgi.8.html \
-                  man.h.html \
+                  mandocd.8.html
+
+WWW_INCS        = man.h.html \
                   manconf.h.html \
                   mandoc.h.html \
                   mandoc_aux.h.html \
@@ -360,9 +363,9 @@ all: mandoc demandoc soelim $(BUILD_TARGETS) Makefile.local
 
 install: base-install $(INSTALL_TARGETS)
 
-www: $(WWW_MANS)
+www: $(WWW_MANS) $(WWW_INCS)
 
-$(WWW_MANS): mandoc
+$(WWW_MANS) $(WWW_INCS): mandoc
 
 .PHONY: base-install cgi-install install www-install
 .PHONY: clean distclean depend
@@ -381,7 +384,7 @@ clean:
        rm -f mandocd catman catman.o $(MANDOCD_OBJS)
        rm -f demandoc $(DEMANDOC_OBJS)
        rm -f soelim $(SOELIM_OBJS)
-       rm -f $(WWW_MANS) mandoc.tar.gz mandoc.sha256
+       rm -f $(WWW_MANS) $(WWW_INCS) mandoc*.tar.gz mandoc*.sha256
        rm -rf *.dSYM
 
 base-install: mandoc demandoc soelim
@@ -515,7 +518,9 @@ soelim: $(SOELIM_OBJS)
 # --- maintainer targets ---
 
 www-install: www
-       $(INSTALL_DATA) $(WWW_MANS) mandoc.css $(HTDOCDIR)
+       $(INSTALL_DATA) mandoc.css $(HTDOCDIR)
+       $(INSTALL_DATA) $(WWW_MANS) $(HTDOCDIR)/man
+       $(INSTALL_DATA) $(WWW_INCS) $(HTDOCDIR)/includes
 
 depend: config.h
        mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
@@ -547,12 +552,12 @@ regress-distcheck:
                ! -path regress/regress.pl \
                ! -path regress/regress.pl.1
 
-dist: mandoc.sha256
+dist: mandoc-$(VERSION).sha256
 
-mandoc.sha256: mandoc.tar.gz
-       sha256 mandoc.tar.gz > $@
+mandoc-$(VERSION).sha256: mandoc-$(VERSION).tar.gz
+       sha256 mandoc-$(VERSION).tar.gz > $@
 
-mandoc.tar.gz: $(DISTFILES)
+mandoc-$(VERSION).tar.gz: $(DISTFILES)
        ls regress/*/*/*.mandoc_* && exit 1 || true
        mkdir -p .dist/mandoc-$(VERSION)/
        $(INSTALL) -m 0644 $(DISTFILES) .dist/mandoc-$(VERSION)
@@ -572,5 +577,6 @@ mandoc.tar.gz: $(DISTFILES)
        highlight -I $< > $@
 
 .1.1.html .3.3.html .5.5.html .7.7.html .8.8.html: mandoc
-       ./mandoc -Thtml -Wall,stop \
-               -Ostyle=mandoc.css,man=%N.%S.html,includes=%I.html $< > $@
+       ./mandoc -Thtml -O \
+       style=/mandoc.css,man=/man/%N.%S.html,includes=/includes/%I.html \
+       $< > $@