From 53d5687049e8bdb3b568febbdf4ed19da4e1a95f Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Thu, 30 Jul 2020 21:42:27 +0000 Subject: trivial sync with OpenBSD in parts of these files that are not used by -portable; consequently, no functional change --- regress/eqn/Makefile.inc | 8 ++++---- regress/roff/de/Makefile | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/regress/eqn/Makefile.inc b/regress/eqn/Makefile.inc index 2e98fb34..9e03e7f8 100644 --- a/regress/eqn/Makefile.inc +++ b/regress/eqn/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.4 2020/01/08 10:17:15 schwarze Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2020/07/30 21:32:19 schwarze Exp $ SKIP_GROFF ?= ${REGRESS_TARGETS} SKIP_TMAN ?= ALL @@ -11,7 +11,7 @@ _FULLHTMLFILES = ${HTML_TARGETS:S/$/.html/} html-clean: .if !empty(_FULLHTMLFILES) - @rm -f ${_HTMLFILES} ${_FULLHTMLFILES} + rm -f ${_HTMLFILES} ${_FULLHTMLFILES} .endif .for t in ${HTML_TARGETS} @@ -23,5 +23,5 @@ ${t}.out_html: ${t}.in .include "../Makefile.inc" .in.mandoc_html: - @${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} > ${.TARGET:S/mandoc_html$/html/} - @${.CURDIR}/../extract.pl < ${.TARGET:S/mandoc_html$/html/} > ${.TARGET} + ${MANDOC} ${MOPTS} -Thtml ${.IMPSRC} > ${.TARGET:S/mandoc_html$/html/} + ${.CURDIR}/../extract.pl < ${.TARGET:S/mandoc_html$/html/} > ${.TARGET} diff --git a/regress/roff/de/Makefile b/regress/roff/de/Makefile index a68656ce..b730ce68 100644 --- a/regress/roff/de/Makefile +++ b/regress/roff/de/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2019/04/21 23:45:50 schwarze Exp $ +# $OpenBSD: Makefile,v 1.14 2020/07/30 21:32:19 schwarze Exp $ REGRESS_TARGETS = append cond empty escname factorial REGRESS_TARGETS += indir infinite startde tab TH Dd @@ -28,17 +28,17 @@ groff-clean: groff-clean-opt # --- local rules --- ascii-diff-opt: TH.mandoc_ascii_opt Dd.mandoc_ascii_opt - @${DIFF} ${.CURDIR}/TH.out_ascii_opt TH.mandoc_ascii_opt - @${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt + ${DIFF} ${.CURDIR}/TH.out_ascii_opt TH.mandoc_ascii_opt + ${DIFF} ${.CURDIR}/Dd.out_ascii_opt Dd.mandoc_ascii_opt TH.mandoc_ascii_opt: TH.in - @${MANDOC} -Ios=OpenBSD -Tascii -man ${.ALLSRC} > ${.TARGET} + ${MANDOC} -Ios=OpenBSD -Tascii -man ${.ALLSRC} > ${.TARGET} Dd.mandoc_ascii_opt: Dd.in - @${MANDOC} -Ios=OpenBSD -Tascii -mdoc ${.ALLSRC} > ${.TARGET} + ${MANDOC} -Ios=OpenBSD -Tascii -mdoc ${.ALLSRC} > ${.TARGET} ascii-clean-opt: - @rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt + rm -f TH.mandoc_ascii_opt Dd.mandoc_ascii_opt TH.out_ascii_opt: TH.in /usr/local/bin/nroff -c -man -Tascii ${.ALLSRC} > ${.TARGET} -- cgit v1.2.3-56-ge451