diff options
| author | bapt <bapt@FreeBSD.org> | 2014-11-23 22:28:46 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-11-23 22:28:46 +0000 |
| commit | 370dd13218b8a5490564fcc006eb30703ff105a0 (patch) | |
| tree | 09b1c1fe643fadba63d381e1dbfc89eadee16a34 | |
| parent | 284b8976e379fc9152cc4d3a1ec44efe5008cc77 (diff) | |
| download | FreeBSD-src-370dd13218b8a5490564fcc006eb30703ff105a0.zip FreeBSD-src-370dd13218b8a5490564fcc006eb30703ff105a0.tar.gz | |
Install mdoc(7) and man(7) from mdoc instead of the one from groff
| -rw-r--r-- | gnu/usr.bin/groff/tmac/Makefile | 3 | ||||
| -rw-r--r-- | tools/build/mk/OptionalObsoleteFiles.inc | 2 | ||||
| -rw-r--r-- | usr.bin/mandoc/Makefile | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile index 195d32f..d74f76a 100644 --- a/gnu/usr.bin/groff/tmac/Makefile +++ b/gnu/usr.bin/groff/tmac/Makefile @@ -11,9 +11,8 @@ MDOCDIR?= ${TMACDIR}/mdoc MAN= groff_ms.7 groff_man.7 groff_me.7 groff_mdoc.7 MAN+= groff_trace.7 groff_www.7 MLINKS= groff_ms.7 ms.7 -MLINKS+= groff_man.7 man.7 MLINKS+= groff_me.7 me.7 -MLINKS+= groff_mdoc.7 mdoc.7 groff_mdoc.7 mdoc.samples.7 +MLINKS+= groff_mdoc.7 mdoc.samples.7 CLEANFILES= ${MAN} ${MDOCFILES:S/$/-s/} ${STRIPFILES:S/$/-s/} ${SPECIALFILES:S/$/-s/} diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d77cef2..fa643a8 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1737,8 +1737,6 @@ OLD_FILES+=usr/share/man/man7/groff_mmse.7.gz OLD_FILES+=usr/share/man/man7/groff_ms.7.gz OLD_FILES+=usr/share/man/man7/groff_trace.7.gz OLD_FILES+=usr/share/man/man7/groff_www.7.gz -OLD_FILES+=usr/share/man/man7/man.7.gz -OLD_FILES+=usr/share/man/man7/mdoc.7.gz OLD_FILES+=usr/share/man/man7/mdoc.samples.7.gz OLD_FILES+=usr/share/man/man7/me.7.gz OLD_FILES+=usr/share/man/man7/mm.7.gz diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index b823657..481a3f9 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -8,7 +8,7 @@ PROG= mandoc FILES= example.style.css style.css FILESDIR= ${SHAREDIR}/mdocml LINKS= mdocml -MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 # man.7 mdoc.7 roff.7 +MAN= mandoc.1 eqn.7 mandoc_char.7 tbl.7 man.7 mdoc.7 # roff.7 MLINKS= mandoc.1 mdocml.1 HTML_SRCS= eqn_html.c \ |
