Hi Ingo,

On Thu, Oct 19, 2023 at 01:59:22PM +0200, Ingo Schwarze wrote:
> Hi Alejandro,
> 
> Ingo Schwarze wrote on Wed, Oct 18, 2023 at 02:04:46AM +0200:
> 
> >  1. change the Makefile to always install mandoc.css
> 
> Done with the commit appended below.
> 
> I believe all issues discovered in the thread "unwanted line break
> after bullet" have now been fixed.  In case i missed something,
> please speak up!

Thanks!  Not as far as I can see.

Cheers,
Alex

> 
> Yours,
>   Ingo
> 
> 
> Log Message:
> -----------
> 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>.
> 
> Modified Files:
> --------------
>     mandoc:
>         Makefile
>         configure
>         configure.local.example
> 
> Revision Data
> -------------
> Index: configure
> ===================================================================
> RCS file: /home/cvs/mandoc/mandoc/configure,v
> retrieving revision 1.82
> retrieving revision 1.83
> diff -Lconfigure -Lconfigure -u -p -r1.82 -r1.83
> --- configure
> +++ 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}
> Index: Makefile
> ===================================================================
> RCS file: /home/cvs/mandoc/mandoc/Makefile,v
> retrieving revision 1.542
> retrieving revision 1.543
> diff -LMakefile -LMakefile -u -p -r1.542 -r1.543
> --- Makefile
> +++ 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)
> Index: configure.local.example
> ===================================================================
> RCS file: /home/cvs/mandoc/mandoc/configure.local.example,v
> retrieving revision 1.44
> retrieving revision 1.45
> diff -Lconfigure.local.example -Lconfigure.local.example -u -p -r1.44 -r1.45
> --- configure.local.example
> +++ 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",
> --
>  To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv
> 

-- 
<https://www.alejandro-colomar.es/>