3 files changed, 38 insertions, 81 deletions

diff --git a/gnu/usr.bin/man/Makefile.shprog b/gnu/usr.bin/man/Makefile.shprog
new file mode 100644
index 000000000000..665a194917ff
--- /dev/null
+++ b/gnu/usr.bin/man/Makefile.shprog
@@ -0,0 +1,30 @@
+# $Id$
+
+# This may become bsd.shprog.mk.  The general version would have to handle:
+# - arbitrary sed substitutions.
+# - programs without man pages.
+# - programs with man pages in sections other than section 1.
+
+MAN1=	${SHPROG:S/$/.1/g}
+
+CLEANFILES+=	${SHPROG} ${MAN1}
+
+all:	${SHPROG}
+
+.sh:
+	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
+	    -e 's,%pager%,${pager},' \
+		${.ALLSRC} > ${.TARGET}
+
+.SUFFIXES: .man .1
+.man.1:
+	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},' \
+		${.ALLSRC} > ${.TARGET}
+
+beforeinstall:
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
+	    ${SHPROG} ${DESTDIR}${BINDIR}
+
+.include <bsd.prog.mk>
diff --git a/gnu/usr.bin/man/apropos/Makefile b/gnu/usr.bin/man/apropos/Makefile
index a13f02acd2d8..0e986bbb27ee 100644
--- a/gnu/usr.bin/man/apropos/Makefile
+++ b/gnu/usr.bin/man/apropos/Makefile
@@ -1,44 +1,6 @@
-# $Id: Makefile,v 1.8 1994/08/28 18:33:42 bde Exp $
+# $Id: Makefile,v 1.9 1995/07/25 00:33:07 bde Exp $
 
-.if exists(${.CURDIR}/obj)
-MAN1=  ${.CURDIR}/obj/apropos.1
-TARG=  ${.CURDIR}/obj/apropos
-.else
-MAN1=  ${.CURDIR}/apropos.1
-TARG=  ${.CURDIR}/apropos
-.endif
+SHPROG=	apropos
 
-MANDEPEND=	${MAN1}
-
-CLEANFILES+=	${TARG} ${MAN1}
-
-all:	${TARG} ${MAN1}
-
-depend rcsfreeze tags all:
-	@echo -n
-
-${TARG}: ${.CURDIR}/apropos.sh
-	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
-	    -e 's,%pager%,${pager},' \
-		${.CURDIR}/apropos.sh > ${.TARGET}
-
-${MAN1}: ${.CURDIR}/apropos.man
-	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},' \
-		${.CURDIR}/apropos.man > ${.TARGET}
-
-install: ${TARG} maninstall
-	${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}/usr/bin
-
-.include "../Makefile.inc"
-
-.if make(maninstall) || make(install)
-.if !defined(NOMAN)
-.include <bsd.man.mk>
-.elif !target(maninstall)
-maninstall:
-.endif
-.endif
-
-.include <bsd.prog.mk>
+.include "../../Makefile.inc"
+.include "../Makefile.shprog"
diff --git a/gnu/usr.bin/man/whatis/Makefile b/gnu/usr.bin/man/whatis/Makefile
index 8ca53dbbee7c..6fb62a287d59 100644
--- a/gnu/usr.bin/man/whatis/Makefile
+++ b/gnu/usr.bin/man/whatis/Makefile
@@ -1,41 +1,6 @@
-.if exists(${.CURDIR}/obj)
-MAN1=  ${.CURDIR}/obj/whatis.1
-TARG=  ${.CURDIR}/obj/whatis
-.else
-MAN1=  ${.CURDIR}/whatis.1
-TARG=  ${.CURDIR}/whatis
-.endif
+# $Id$
 
-MANDEPEND=	${MAN1}
+SHPROG=	whatis
 
-CLEANFILES+=	${TARG} ${MAN1}
-
-all:	${TARG} ${MAN1}
-
-depend rcsfreeze tags all:
-	@echo -n
-
-${TARG}: ${.CURDIR}/whatis.sh
-	sed -e 's,%libdir%,${libdir},' -e 's,%bindir%,${bindir},' \
-	    -e 's,%pager%,${pager},' \
-		${.CURDIR}/whatis.sh > ${.TARGET}
-
-${MAN1}: ${.CURDIR}/whatis.man
-	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},' \
-		${.CURDIR}/whatis.man > ${.TARGET}
-
-install: ${TARG} maninstall
-	${INSTALL} -c -o bin -g bin -m 555 ${TARG} ${DESTDIR}/usr/bin
-
-.include "../Makefile.inc"
-.if make(maninstall) || make(install)
-.if !defined(NOMAN)
-.include <bsd.man.mk>
-.else
-maninstall:
-.endif
-.endif
-
-.include <bsd.prog.mk>
+.include "../../Makefile.inc"
+.include "../Makefile.shprog"