Move man page - get rid of build artifact - have makefile install

man page.

4 files changed, 4 insertions, 32 deletions

diff --git a/usr.sbin/httpd/Makefile b/usr.sbin/httpd/Makefile
index e8d846f0915..03144984e61 100644
--- a/usr.sbin/httpd/Makefile
+++ b/usr.sbin/httpd/Makefile
@@ -1,3 +1,4 @@
+MAN = httpd.8
 SUBDIR+=src
 WWWROOT=/var/www
 CONFFILES= \
@@ -111,3 +112,4 @@ distribution:
 	done
 
 .include<bsd.subdir.mk>
+.include<bsd.man.mk>
diff --git a/usr.sbin/httpd/src/httpd.8 b/usr.sbin/httpd/httpd.8
index cd31ed7c3ec..cd31ed7c3ec 100644
--- a/usr.sbin/httpd/src/httpd.8
+++ b/usr.sbin/httpd/httpd.8
diff --git a/usr.sbin/httpd/src/Makefile.bsd-wrapper b/usr.sbin/httpd/src/Makefile.bsd-wrapper
index bc836a9c85b..4ec10180b37 100644
--- a/usr.sbin/httpd/src/Makefile.bsd-wrapper
+++ b/usr.sbin/httpd/src/Makefile.bsd-wrapper
@@ -1,10 +1,10 @@
 
 .include <bsd.own.mk>
-
 PROG=httpd
 BINDIR=/usr/sbin
 BINOWN=root
 BINGRP=daemon
+#MAN=	httpd.8
 
 all: Makefile
 	${MAKE}
@@ -20,12 +20,7 @@ config:	.FORCE
 Makefile: helpers/GuessOS
 	sh ${.CURDIR}/Configure -file ${.CURDIR}/Configuration -make ${.CURDIR}/Makefile.tmpl
 
-# apache has no man pages in the dist
-
-maninistall:
-	@echo No man pages for apache
-
-install: maninistall
+install:
 	${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${PROG} ${BINDIR} 
 
 clean cleandir:
diff --git a/usr.sbin/httpd/src/htconf.634 b/usr.sbin/httpd/src/htconf.634
deleted file mode 100644
index e8e7e53fdb7..00000000000
--- a/usr.sbin/httpd/src/htconf.634
+++ /dev/null
@@ -1,25 +0,0 @@
-EXTRA_CFLAGS=
-EXTRA_LFLAGS=
-EXTRA_LIBS=
-EXTRA_INCLUDES=
-##Rule:STATUS=yes
-##Rule:SOCKS4=no
-##Rule:IRIXNIS=no
-##Rule:WANTHSREGEX=default
-Module env_module          mod_env.o
-Module config_log_module   mod_log_config.o
-Module mime_module         mod_mime.o
-Module negotiation_module  mod_negotiation.o
-Module includes_module     mod_include.o
-Module dir_module          mod_dir.o
-Module cgi_module          mod_cgi.o
-Module asis_module         mod_asis.o
-Module imap_module         mod_imap.o
-Module action_module       mod_actions.o
-Module userdir_module      mod_userdir.o
-Module alias_module        mod_alias.o
-Module access_module       mod_access.o
-Module auth_module         mod_auth.o
-Module db_auth_module      mod_auth_db.o
-Module dbm_auth_module     mod_auth_dbm.o
-Module browser_module      mod_browser.o