Stop using the moribund MLINKS bsd.man.mk feature for clang(1).

Patch clang.rst such that "gmake -f Makefile.sphinx man" keeps working.
Using input from jsg@; OK patrick@; "no worries" deraadt@

2 files changed, 9 insertions, 8 deletions

diff --git a/gnu/usr.bin/clang/clang/Makefile b/gnu/usr.bin/clang/clang/Makefile
index f46e5653e9d..52b390ce2e1 100644
--- a/gnu/usr.bin/clang/clang/Makefile
+++ b/gnu/usr.bin/clang/clang/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2019/03/06 14:35:28 jsg Exp $
+# $OpenBSD: Makefile,v 1.15 2019/05/16 15:38:56 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -12,16 +12,17 @@ SRCS=	driver.cpp \
 
 LINKS=	${BINDIR}/clang ${BINDIR}/clang++ \
 	${BINDIR}/clang ${BINDIR}/clang-cpp
-MLINKS=	clang.1 clang++.1 \
-	clang.1 clang-cpp.1
 
 .if ${COMPILER_VERSION:L} == "clang"
 LINKS+=	${BINDIR}/clang ${BINDIR}/cc \
 	${BINDIR}/clang ${BINDIR}/c++ \
 	${BINDIR}/clang ${LIBEXECDIR}/cpp
-MLINKS+=clang.1 cc.1 \
-	clang.1 c++.1 \
-	clang.1 cpp.1
+
+maninstall:
+	cd ${DESTDIR}${MANDIR}1 && { \
+	rm -f cc.1 && ln clang.1 cc.1; \
+	rm -f c++.1 && ln clang.1 c++.1; \
+	rm -f cpp.1 && ln clang.1 cpp.1; }
 .endif
 
 CPPFLAGS+=	-I${.CURDIR}/../../../llvm/tools/clang/include
diff --git a/gnu/usr.bin/clang/clang/clang.1 b/gnu/usr.bin/clang/clang/clang.1
index daef9e0060d..9bc3db5e723 100644
--- a/gnu/usr.bin/clang/clang/clang.1
+++ b/gnu/usr.bin/clang/clang/clang.1
@@ -1,8 +1,8 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "CLANG" "1" "Jan 27, 2019" "7" "Clang"
+.TH "CLANG, CLANG++, CLANG-CPP" "1" "May 09, 2019" "7" "Clang"
 .SH NAME
-clang \- the Clang C, C++, and Objective-C compiler
+clang, clang++, clang-cpp \- the Clang C, C++, and Objective-C compiler
 .
 .nr rst2man-indent-level 0
 .