From 96846b00a742c57c932578a0a4e1554566631b5e Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Thu, 19 Oct 2023 11:45:42 +0000 Subject: 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 . --- Makefile | 2 ++ configure | 3 +++ configure.local.example | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 0ee080be..3609d350 100644 --- a/Makefile +++ b/Makefile @@ -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) diff --git a/configure b/configure index d6e00e2a..8ed55d55 100755 --- a/configure +++ b/configure @@ -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", -- cgit