summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraoyama <aoyama@openbsd.org>2017-10-29 12:42:11 +0000
committeraoyama <aoyama@openbsd.org>2017-10-29 12:42:11 +0000
commita7a6f40cd83f02dd5bdeb80e5c9bb72c32d6ac72 (patch)
tree1e8dac9ec5aaecccdfd90f7e3549d6bd6eaef037
parentFinish TURBOchannel scatter/gather map code (i.e. make it work) and (diff)
downloadwireguard-openbsd-a7a6f40cd83f02dd5bdeb80e5c9bb72c32d6ac72.tar.xz
wireguard-openbsd-a7a6f40cd83f02dd5bdeb80e5c9bb72c32d6ac72.zip
Unify protoize.1 install process on gcc3 arch (luna88k).
ok guenther@
-rw-r--r--gnu/usr.bin/Makefile4
-rw-r--r--gnu/usr.bin/gcc/Makefile.bsd-wrapper4
2 files changed, 3 insertions, 5 deletions
diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index 7017c24ea07..b12cbfc15cc 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2017/07/27 19:44:45 deraadt Exp $
+# $OpenBSD: Makefile,v 1.61 2017/10/29 12:42:11 aoyama Exp $
# $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
.include <bsd.own.mk>
@@ -29,12 +29,10 @@ SUBDIR+= binutils-2.17
# Do these last; texinfo builds the info 'dir' file, perl must be after binutils
SUBDIR+= perl texinfo
-.if ${COMPILER_VERSION:L} != "gcc3"
maninstall:
${INSTALL} ${INSTALL_COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \
gcc/protoize.1 ${DESTDIR}${MANDIR}1/protoize.1
@rm -f ${DESTDIR}${MANDIR}1/unprotoize.1
ln ${DESTDIR}${MANDIR}1/protoize.1 ${DESTDIR}${MANDIR}1/unprotoize.1
-.endif
.include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/gcc/Makefile.bsd-wrapper b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
index 2d07086470f..768d8b4d20d 100644
--- a/gnu/usr.bin/gcc/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/gcc/Makefile.bsd-wrapper
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.67 2017/07/11 15:15:47 espie Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.68 2017/10/29 12:42:11 aoyama Exp $
-MAN= gcc.1 cpp.1 gcov.1 protoize.1
+MAN= gcc.1 cpp.1 gcov.1
BINDIR=/usr/bin
.if defined(BOOTSTRAP)