diff options
| -rw-r--r-- | Makefile.cross | 4 | ||||
| -rw-r--r-- | gnu/usr.bin/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/bind/Makefile.bsd-wrapper | 23 |
3 files changed, 6 insertions, 25 deletions
diff --git a/Makefile.cross b/Makefile.cross index f4749f9bca7..d265046d438 100644 --- a/Makefile.cross +++ b/Makefile.cross @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.71 2014/05/09 20:14:18 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.72 2014/07/16 01:23:39 deraadt Exp $ cross-tools: cross-includes cross-binutils cross-gcc cross-lib cross-distrib: cross-tools cross-bin cross-share cross-sys cross-etc-root-var @@ -113,7 +113,7 @@ BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION} NO_CROSS+=bind NO_CROSS+=httpd NO_CROSS+=microcode -NO_CROSS+=groff lynx binutils binutils-2.17 perl texinfo gcc cvs +NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs NO_CROSS+=nsd NO_CROSS+=nginx NO_CROSS+=sqlite3 diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 52f88f1ae53..2b6dfa773a7 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.54 2013/08/06 19:11:53 miod Exp $ +# $OpenBSD: Makefile,v 1.55 2014/07/16 01:23:39 deraadt Exp $ # $NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $ .include <bsd.own.mk> @@ -13,7 +13,7 @@ SUBDIR+= cc . endif .endif -SUBDIR+= cxxfilt cvs lynx +SUBDIR+= cxxfilt cvs .if make(obj) SUBDIR+= binutils binutils-2.17 .else diff --git a/usr.sbin/bind/Makefile.bsd-wrapper b/usr.sbin/bind/Makefile.bsd-wrapper index d187461e9a7..b1787e14d6c 100644 --- a/usr.sbin/bind/Makefile.bsd-wrapper +++ b/usr.sbin/bind/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2007/12/09 13:39:42 jakob Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2014/07/16 01:23:39 deraadt Exp $ .include <bsd.own.mk> @@ -36,19 +36,7 @@ MAN= bin/check/named-checkconf.8 \ bin/rndc/rndc.8 \ bin/rndc/rndc.conf.5 -HTML= doc/arm/Bv9ARM.html \ - doc/arm/Bv9ARM.ch01.html \ - doc/arm/Bv9ARM.ch02.html \ - doc/arm/Bv9ARM.ch03.html \ - doc/arm/Bv9ARM.ch04.html \ - doc/arm/Bv9ARM.ch05.html \ - doc/arm/Bv9ARM.ch06.html \ - doc/arm/Bv9ARM.ch07.html \ - doc/arm/Bv9ARM.ch08.html \ - doc/arm/Bv9ARM.ch09.html - BINDIR= /usr/sbin -HTMLDIR= /usr/share/doc/html/bind all: config.status @@ -74,14 +62,7 @@ maninstall: @echo NOMAN is set .endif -htmlinstall: -.for file in ${HTML} - ${INSTALL} ${INSTALL_COPY} \ - -o ${DOCOWN} -g ${DOCGRP} -m ${DOCMODE} \ - ${.CURDIR}/${file} ${DESTDIR}${HTMLDIR} -.endfor - -install: maninstall htmlinstall +install: maninstall .for file in ${PROG} ${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} \ -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ |