summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cpp/Makefile6
-rw-r--r--usr.bin/mandoc/Makefile8
2 files changed, 4 insertions, 10 deletions
diff --git a/usr.bin/cpp/Makefile b/usr.bin/cpp/Makefile
index d783b13bb07..4cd42f4706d 100644
--- a/usr.bin/cpp/Makefile
+++ b/usr.bin/cpp/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/05/10 18:20:31 drahn Exp $
+# $OpenBSD: Makefile,v 1.11 2013/08/06 19:11:53 miod Exp $
.include <bsd.own.mk>
@@ -11,10 +11,8 @@ INSTALL_STRIP=
cpp: cpp.sh
.if ${COMPILER_VERSION:L} == "gcc3"
sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
-.elif ${COMPILER_VERSION:L} == "gcc4"
- sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
.else
- sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@/-$$/' ${.CURDIR}/cpp.sh >$@
+ sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
.endif
.include <bsd.prog.mk>
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index e9bd2d34811..c67f79c002f 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,13 +1,9 @@
-# $OpenBSD: Makefile,v 1.69 2012/04/15 13:52:59 schwarze Exp $
+# $OpenBSD: Makefile,v 1.70 2013/08/06 19:11:53 miod Exp $
.include <bsd.own.mk>
CFLAGS+=-DVERSION=\"1.12.1\"
-CFLAGS+=-W -Wall -Wstrict-prototypes
-
-.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4"
-CFLAGS+=-Wno-unused-parameter
-.endif
+CFLAGS+=-W -Wall -Wstrict-prototypes -Wno-unused-parameter
SRCS= roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c mandoc.c read.c
SRCS+= mdoc_macro.c mdoc.c mdoc_hash.c \