diff options
| author |   schwarze <schwarze@openbsd.org> | 2011-05-31 08:00:25 +0000 |
|---|---|---|
| committer | schwarze <schwarze@openbsd.org> | 2011-05-31 08:00:25 +0000 |
| commit | 1a024edf32e631907a1154f9bbab76e4868645ef (patch) | |
| tree | 1472a328b21a774b32fe7630e1484024f0db9d5b | |
| parent | work around startup and teardown races; caught by deraadt (diff) | |
| download | wireguard-openbsd-1a024edf32e631907a1154f9bbab76e4868645ef.tar.xz wireguard-openbsd-1a024edf32e631907a1154f9bbab76e4868645ef.zip | |
When running "make obj" before "make regress", the desired output
files *.out_ascii and the actual output files *.mandoc_ascii do not
live in the same directories, so explicitely tell diff(1) where to
find the former. Problem reported by deraadt@.
While here, purge an obsolete knob from the optional MANDOCOPTS variable
and update the path to the ports groff (only needed by mandoc developers
to generate desired output files).
| -rw-r--r-- | regress/usr.bin/mandoc/Makefile.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regress/usr.bin/mandoc/Makefile.inc b/regress/usr.bin/mandoc/Makefile.inc index 3f80eb2d939..24cf039eba9 100644 --- a/regress/usr.bin/mandoc/Makefile.inc +++ b/regress/usr.bin/mandoc/Makefile.inc @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.4 2010/06/27 19:56:11 phessler Exp $ +# $OpenBSD: Makefile.inc,v 1.5 2011/05/31 08:00:25 schwarze Exp $ DIFF=diff -au MANDOC?=mandoc -#MANDOCOPTS=-fstrict -Wall -NROFF=nroff -mandoc +#MANDOCOPTS=-Wall +NROFF=/usr/local/bin/nroff -c -mandoc -Tascii SED=sed SH=/bin/sh @@ -17,7 +17,7 @@ groff: ${GROFF_TARGETS:C/$/.out_ascii/} @echo " -> ${*}" @${MANDOC} ${MANDOCOPTS} ${.CURDIR}/${*}.in | ${SED} '$$d' \ > ${*}.mandoc_ascii - @${DIFF} ${*}.out_ascii ${*}.mandoc_ascii + @${DIFF} ${.CURDIR}/${*}.out_ascii ${*}.mandoc_ascii .in.out_ascii: @echo " -> ${*}" |