aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-11-23 22:28:46 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-11-23 22:28:46 +0000
commitb8d52ac37c9163fd48e952341bbffbbd1945d3c8 (patch)
tree09b1c1fe643fadba63d381e1dbfc89eadee16a34
parentb156563c0c0a8c11446e3730dcb0e1b6a7c8e291 (diff)
Notes
-rw-r--r--gnu/usr.bin/groff/tmac/Makefile3
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc2
-rw-r--r--usr.bin/mandoc/Makefile2
3 files changed, 2 insertions, 5 deletions
diff --git a/gnu/usr.bin/groff/tmac/Makefile b/gnu/usr.bin/groff/tmac/Makefile
index 195d32fbdcb14..d74f76a28c5cc 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 d77cef2679076..fa643a80916ba 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 b82365742b154..481a3f9c5c73c 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 \