diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2023-10-19 11:45:42 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2023-10-19 11:45:42 +0000 |
commit | 96846b00a742c57c932578a0a4e1554566631b5e (patch) | |
tree | 2370974d028f8d18bc38cf1d0faa99b1c7a8ca75 | |
parent | 35dce537e71343cdee4db304dfb87c588723d065 (diff) | |
download | mandoc-96846b00a742c57c932578a0a4e1554566631b5e.tar.gz |
Install mandoc.css by default even if man.cgi(8) is not built.
It matters because users of "mandoc -T html" typically need it.
Issue found in a conversation with Alejandro Colomar <alx at kernel aot org>.
-rw-r--r-- | Makefile | 2 | ||||
-rwxr-xr-x | configure | 3 | ||||
-rw-r--r-- | configure.local.example | 4 |
3 files changed, 9 insertions, 0 deletions
@@ -416,6 +416,7 @@ base-install: mandoc demandoc soelim mkdir -p $(DESTDIR)$(MANDIR)/man5 mkdir -p $(DESTDIR)$(MANDIR)/man7 mkdir -p $(DESTDIR)$(MANDIR)/man8 + mkdir -p $(DESTDIR)$(MISCDIR) $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR) $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM) cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN) @@ -438,6 +439,7 @@ base-install: mandoc demandoc soelim $(INSTALL_MAN) mandoc_char.7 $(DESTDIR)$(MANDIR)/man7 $(INSTALL_MAN) makewhatis.8 \ $(DESTDIR)$(MANDIR)/man8/$(BINM_MAKEWHATIS).8 + $(INSTALL_DATA) mandoc.css $(DESTDIR)$(MISCDIR) lib-install: libmandoc.a mkdir -p $(DESTDIR)$(LIBDIR) @@ -111,6 +111,7 @@ BIN_FROM_SBIN= INCLUDEDIR= LIBDIR= MANDIR= +MISCDIR= READ_ALLOWED_PATH= WWWPREFIX="/var/www" @@ -620,6 +621,7 @@ exec > Makefile.local [ -z "${INCLUDEDIR}" ] && INCLUDEDIR="${PREFIX}/include/mandoc" [ -z "${LIBDIR}" ] && LIBDIR="${PREFIX}/lib/mandoc" [ -z "${MANDIR}" ] && MANDIR="${PREFIX}/man" +[ -z "${MISCDIR}" ] && MISCDIR="${PREFIX}/share/misc" [ -z "${HTDOCDIR}" ] && HTDOCDIR="${WWWPREFIX}/htdocs" [ -z "${CGIBINDIR}" ] && CGIBINDIR="${WWWPREFIX}/cgi-bin" @@ -658,6 +660,7 @@ BIN_FROM_SBIN = ${BIN_FROM_SBIN} INCLUDEDIR = ${INCLUDEDIR} LIBDIR = ${LIBDIR} MANDIR = ${MANDIR} +MISCDIR = ${MISCDIR} WWWPREFIX = ${WWWPREFIX} HTDOCDIR = ${HTDOCDIR} CGIBINDIR = ${CGIBINDIR} diff --git a/configure.local.example b/configure.local.example index 3fa240c9..2732c0b9 100644 --- a/configure.local.example +++ b/configure.local.example @@ -108,11 +108,15 @@ OSNAME="OpenBSD 7.0" # there is no need to copy the whole block. # Even if you set PREFIX to something else, the other variables # pick it up without copying them all over. +# MISCDIR is only used for installing the file mandoc.css. +# That is important because users of "mandoc -T html" often need it +# even if they are not using man.cgi(8), see mandoc(1) for details. PREFIX="/usr/local" BINDIR="${PREFIX}/bin" SBINDIR="${PREFIX}/sbin" MANDIR="${PREFIX}/man" +MISCDIR="${PREFIX}/share/misc" # If BINDIR and SBINDIR are not subdirectories of the same parent # directory or if the basename(1) of BINDIR differs from "bin", |