MAN[1-9] -> MAN.

5 files changed, 13 insertions, 14 deletions

diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog
index 819ed33..07fb1ed 100644
--- a/gnu/usr.bin/man/Makefile.shprog
+++ b/gnu/usr.bin/man/Makefile.shprog
@@ -5,9 +5,9 @@
 # - programs without man pages.
 # - programs with man pages in sections other than section 1.
 
-MAN1=	${SHPROG:S/$/.1/g}
+MAN=	${SHPROG:S/$/.1/g}
 
-CLEANFILES+=	${SHPROG} ${MAN1}
+CLEANFILES+=	${SHPROG} ${MAN}
 
 all:	${SHPROG}
 
diff --git a/gnu/usr.bin/man/catman/Makefile b/gnu/usr.bin/man/catman/Makefile
index 075bfdf..bd5ce9e 100644
--- a/gnu/usr.bin/man/catman/Makefile
+++ b/gnu/usr.bin/man/catman/Makefile
@@ -3,7 +3,7 @@
 MAINTAINER= wosch
 
 
-MAN1=	catman.1
+MAN=	catman.1
 
 beforeinstall:
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
diff --git a/gnu/usr.bin/man/makewhatis/Makefile b/gnu/usr.bin/man/makewhatis/Makefile
index 1de2f08..d196003 100644
--- a/gnu/usr.bin/man/makewhatis/Makefile
+++ b/gnu/usr.bin/man/makewhatis/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 MAINTAINER= wosch
 
-MAN1=	makewhatis.1
-MAN8=	makewhatis.local.8
+MAN=	makewhatis.1 makewhatis.local.8
 MLINKS=	makewhatis.local.8 catman.local.8
 
 libexecdir=/usr/libexec
diff --git a/gnu/usr.bin/man/man/Makefile b/gnu/usr.bin/man/man/Makefile
index 41d620b..852e43b 100644
--- a/gnu/usr.bin/man/man/Makefile
+++ b/gnu/usr.bin/man/man/Makefile
@@ -21,16 +21,16 @@ CFLAGS+=-DHAVE_LIBZ=1
 
 CFLAGS+= -I${.CURDIR}/../lib -DSTDC_HEADERS -DPOSIX -DHAS_TROFF
 CFLAGS+= -DDO_COMPRESS -DALT_SYSTEMS -DSETREUID -DCATMODE=0644
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	man.1
 
 .PATH:	${.CURDIR}/../manpath
 
-.include <bsd.prog.mk>
-
-${MAN1}: ${.CURDIR}/man.man
+man.1: ${.CURDIR}/man.man
 	@${ECHO} echo Making ${.TARGET:T} from ${.ALLSRC:T}; \
 	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
 	    -e 's,%pager%,${pager},' -e 's,%troff%,${troff},' \
 	    -e 's,%manpath_config_file%,${manpath_config_file},' \
 	    -e 's,%compress%,${compress},' \
-	${.CURDIR}/man.man > ${MAN1}
+	${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/manpath/Makefile b/gnu/usr.bin/man/manpath/Makefile
index 72f4d80..2c57188 100644
--- a/gnu/usr.bin/man/manpath/Makefile
+++ b/gnu/usr.bin/man/manpath/Makefile
@@ -7,11 +7,11 @@ LDADD=	${LIBMAN}
 
 CFLAGS+= -DMAIN -DSTDC_HEADERS -DPOSIX -DHAS_TROFF -DDO_UNCOMPRESS
 CFLAGS+= -DALT_SYSTEMS -I${.CURDIR}/../lib -I${.OBJDIR}/../lib
-CLEANFILES+=	${MAN1}
+CLEANFILES+=	manpath.1
 
-.include <bsd.prog.mk>
-
-${MAN1}: ${.CURDIR}/manpath.man
+manpath.1: ${.CURDIR}/manpath.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \
 	sed -e 's,%manpath_config_file%,/etc/manpath.config,' \
 	${.ALLSRC} > ${.TARGET}
+
+.include <bsd.prog.mk>