diff options
author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-06-11 12:48:20 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2011-06-11 12:48:20 +0000 |
commit | 5d0e4d24b95bfb54f541ac6ba4c5e24044ec78af (patch) | |
tree | 221e9dc3041cfb74b3f64249657fa81616142d6f /usr.sbin/nsd/Makefile.bsd-wrapper | |
parent | 76bb975f8e5e5b8184be675108b355d2fd1e98b3 (diff) |
Unbreak the build with MANPS, making sure to still honour NOMAN.
Problem found and fix tested by jmc@.
Note that the patch to Makefile.in is useful for two additional reasons:
1. It removes an ugly reimplementation of the bsd.man.mk .8.cat8 target.
2. It will be required anyway when installing source manuals in the future.
The bsd-wrapper patch looks redundant, but isn't. These rules are not
in bsd.man.mk because elsewhere, the source files (*.8 etc.) are part of
the source tree, not generated files.
Diffstat (limited to 'usr.sbin/nsd/Makefile.bsd-wrapper')
-rw-r--r-- | usr.sbin/nsd/Makefile.bsd-wrapper | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.sbin/nsd/Makefile.bsd-wrapper b/usr.sbin/nsd/Makefile.bsd-wrapper index bc1d8e6504e..0ae4cd6904e 100644 --- a/usr.sbin/nsd/Makefile.bsd-wrapper +++ b/usr.sbin/nsd/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.6 2011/01/24 10:39:46 jakob Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2011/06/11 12:48:19 schwarze Exp $ .include <bsd.own.mk> @@ -27,8 +27,15 @@ PROG= nsd nsd-zonec nsd-notify nsd-checkconf nsd-patch nsd-xfer MAN= nsd.8 nsdc.8 nsd-zonec.8 nsd-notify.8 nsd-checkconf.8 nsd-patch.8 \ nsd-xfer.8 nsd.conf.5 +all: gnu -all: config.status +.ifndef NOMAN +${MANALL} ${PSALL}: ${MAN} + +${MAN}: gnu +.endif + +gnu: config.status ${MAKE} .FORCE: .IGNORE |