NOMAN fixes

3 files changed, 16 insertions, 5 deletions

diff --git a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
index 3dd507d5322..009d2a9320f 100644
--- a/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
+++ b/gnu/lib/libg++/libg++/gperf/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.11 1998/07/24 00:10:47 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.12 1998/12/05 19:43:44 kstailey Exp $
 
 .if defined(OBJMACHINE)
 OBJDIR=	obj.${MACHINE}
@@ -55,6 +55,8 @@ $(STD_OBJDIR)/libstdc++.a:
 $(GXX_OBJDIR)/libg++.a:
 	cd $(GXX_DIR); $(MAKE) -f Makefile.bsd-wrapper SUBDIR=
 
+.include <bsd.own.mk>	# for NOMAN if it's there
+
 .if !defined(NOMAN)
 install: maninstall 
 .else
diff --git a/gnu/usr.bin/lynx/Makefile.bsd-wrapper b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
index d60ddb6be65..9479763daed 100644
--- a/gnu/usr.bin/lynx/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/lynx/Makefile.bsd-wrapper
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.3 1998/10/18 20:02:35 millert Exp $
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.4 1998/12/05 19:43:46 kstailey Exp $
 
 MAN=	lynx.1
 CLEANFILES=	lynx.1
@@ -15,13 +15,19 @@ HELPFILES=	keystrokes/bookmark_help.html keystrokes/cookie_help.html \
 		about_lynx.html lynx-dev.html lynx_help_main.html \
 		lynx_url_support.html
 
-all:	config.status lynx.cat1
+.include <bsd.own.mk>
+
+.ifdef NOMAN
+LYNX_CAT1=
+.else
+LYNX_CAT1=lynx.cat1
+.endif
+
+all:	config.status ${LYNX_CAT1}
 	${MAKE} ${GNUCFLAGS}
 
 .FORCE:	.IGNORE
 
-.include <bsd.own.mk>
-
 .ifdef GLOBAL_AUTOCONF_CACHE
 CF=	--cache-file=${GLOBAL_AUTOCONF_CACHE}
 .else
diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/httpd/Makefile
index 1255ff4299e..efd90c2f82c 100644
--- a/usr.sbin/httpd/Makefile
+++ b/usr.sbin/httpd/Makefile
@@ -174,4 +174,7 @@ distribution:
 
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
+.include <bsd.own.mk>	# for NOMAN if it's there
+.ifndef NOMAN
 .include <bsd.man.mk>
+.endif