9 files changed, 10 insertions, 55 deletions

diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 3f9d50617ba1..dcff4f87d497 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -1,7 +1,3 @@
-#	@(#)Makefile.dev	6.2 (Berkeley) 3/16/91
-# Client Makefiles define DEV and DEVFILES and provide rules for
-# individual font files
-#
 # $FreeBSD$
 
 .include "../Makefile.cfg"
@@ -14,20 +10,8 @@ FONTMODE?=	${NOBINMODE}
 
 all:	$(DEVFILES)
 
-.for f in $(DEVFILES)
-.if exists(${.OBJDIR}/$f)
-beforeinstall:: ${.OBJDIR}/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		${.OBJDIR}/$f $(DESTDIR)$(DEVICEDIR)
-.elif exists(${.CURDIR}/$f)
-beforeinstall:: ${.CURDIR}/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		${.CURDIR}/$f $(DESTDIR)$(DEVICEDIR)
-.else
-beforeinstall:: $(DIST_DIR)/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		$(DIST_DIR)/$f $(DESTDIR)$(DEVICEDIR)
-.endif
-.endfor
+beforeinstall: ${DEVFILES}
+	${INSTALL} -c -o ${FONTOWN} -g ${FONTGRP} -m ${FONTMODE} \
+		${.ALLSRC} ${DESTDIR}${DEVICEDIR}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/Makefile.tty b/gnu/usr.bin/groff/Makefile.tty
index 6d27a3b42b4a..94ca32e2a152 100644
--- a/gnu/usr.bin/groff/Makefile.tty
+++ b/gnu/usr.bin/groff/Makefile.tty
@@ -30,5 +30,3 @@ DESC: DESC.proto
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
 	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
 	    ${DIST_DIR}/DESC.proto >$@
-
-beforeinstall:: ${DEVFILES}
diff --git a/gnu/usr.bin/groff/devdvi/Makefile b/gnu/usr.bin/groff/devdvi/Makefile
index be769922c54a..cb747a5a4ee5 100644
--- a/gnu/usr.bin/groff/devdvi/Makefile
+++ b/gnu/usr.bin/groff/devdvi/Makefile
@@ -9,8 +9,6 @@ DEVFILES=	DESC R I B BI CW CWI MI S EX H HI HB SA SB \
 
 CLEANFILES+=	DESC
 
-.include "../Makefile.inc"
-
 DESC:	DESC.in
 	cat ${DIST_DIR}/DESC.in >DESC
 	test -z '${DVIPRINT}' || echo print '${DVIPRINT}' >>DESC
diff --git a/gnu/usr.bin/groff/devhtml/Makefile b/gnu/usr.bin/groff/devhtml/Makefile
index 06265d9b9ac7..190cb9257bd7 100644
--- a/gnu/usr.bin/groff/devhtml/Makefile
+++ b/gnu/usr.bin/groff/devhtml/Makefile
@@ -3,5 +3,4 @@
 DEV=		html
 DEVFILES=	DESC TR TI TB TBI CR CI CB CBI HR HI HB HBI NR NI NB NBI S
 
-.include "../Makefile.inc"
 .include "../Makefile.dev"
diff --git a/gnu/usr.bin/groff/devlbp/Makefile b/gnu/usr.bin/groff/devlbp/Makefile
index 164d9eced7f6..e6cb556d761f 100644
--- a/gnu/usr.bin/groff/devlbp/Makefile
+++ b/gnu/usr.bin/groff/devlbp/Makefile
@@ -6,8 +6,6 @@ DEVFILES=	DESC HB HBI HI HR TB TBI TI TR
 
 CLEANFILES+=	DESC
 
-.include "../Makefile.inc"
-
 DESC:	DESC.in
 	-rm -f DESC
 	cat ${DIST_DIR}/DESC.in >DESC
diff --git a/gnu/usr.bin/groff/devlj4/Makefile b/gnu/usr.bin/groff/devlj4/Makefile
index 386abf6419b2..f4318ad6ff4c 100644
--- a/gnu/usr.bin/groff/devlj4/Makefile
+++ b/gnu/usr.bin/groff/devlj4/Makefile
@@ -11,8 +11,6 @@ DEVFILES=	DESC \
 
 CLEANFILES+=	DESC
 
-.include "../Makefile.inc"
-
 DESC: DESC.in
 	-rm -f DESC
 	echo "res $(LJ4RES)" >DESC
diff --git a/gnu/usr.bin/groff/devps/Makefile b/gnu/usr.bin/groff/devps/Makefile
index 3a43b1894ea3..cef3fd1aa62c 100644
--- a/gnu/usr.bin/groff/devps/Makefile
+++ b/gnu/usr.bin/groff/devps/Makefile
@@ -13,8 +13,6 @@ DEVFILES=	DESC $(PSFILES) $(DISTFILES) $(DEVGENFILES)
 
 CLEANFILES+=	DESC ${PSFILES}
 
-.include "../Makefile.inc"
-
 DESC: DESC.in
 	-rm -f DESC
 	cat ${DIST_DIR}/DESC.in >DESC
@@ -30,12 +28,12 @@ fonts: DESC
 	${MAKE} -f ${DIST_DIR}/generate/Makefile \
 	  srcdir=${DIST_DIR}/generate DESC=${DIST_DIR}/DESC.in
 
-prologue:	${DIST_DIR}/prologue.ps
-zapfdr.pfa:	${DIST_DIR}/zapfdr.ps
-symbolsl.pfa:	${DIST_DIR}/symbolsl.ps
-
 ${PSFILES}:
 	-rm -f $@
 	sed -f ${DIST_DIR}/psstrip.sed $? >$@
 
 .include "../Makefile.dev"
+
+prologue:	${DIST_DIR}/prologue.ps
+zapfdr.pfa:	${DIST_DIR}/zapfdr.ps
+symbolsl.pfa:	${DIST_DIR}/symbolsl.ps
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 3f9d50617ba1..dcff4f87d497 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -1,7 +1,3 @@
-#	@(#)Makefile.dev	6.2 (Berkeley) 3/16/91
-# Client Makefiles define DEV and DEVFILES and provide rules for
-# individual font files
-#
 # $FreeBSD$
 
 .include "../Makefile.cfg"
@@ -14,20 +10,8 @@ FONTMODE?=	${NOBINMODE}
 
 all:	$(DEVFILES)
 
-.for f in $(DEVFILES)
-.if exists(${.OBJDIR}/$f)
-beforeinstall:: ${.OBJDIR}/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		${.OBJDIR}/$f $(DESTDIR)$(DEVICEDIR)
-.elif exists(${.CURDIR}/$f)
-beforeinstall:: ${.CURDIR}/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		${.CURDIR}/$f $(DESTDIR)$(DEVICEDIR)
-.else
-beforeinstall:: $(DIST_DIR)/$f
-	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
-		$(DIST_DIR)/$f $(DESTDIR)$(DEVICEDIR)
-.endif
-.endfor
+beforeinstall: ${DEVFILES}
+	${INSTALL} -c -o ${FONTOWN} -g ${FONTGRP} -m ${FONTMODE} \
+		${.ALLSRC} ${DESTDIR}${DEVICEDIR}
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.tty b/gnu/usr.bin/groff/font/Makefile.tty
index 6d27a3b42b4a..94ca32e2a152 100644
--- a/gnu/usr.bin/groff/font/Makefile.tty
+++ b/gnu/usr.bin/groff/font/Makefile.tty
@@ -30,5 +30,3 @@ DESC: DESC.proto
 	    -e "s/^vert .*$$/vert `expr $(RES) / $(LPI)`/" \
 	    -e "s/^fonts .*$$/fonts `set $(FONTS); echo $$#` $(FONTS)/" \
 	    ${DIST_DIR}/DESC.proto >$@
-
-beforeinstall:: ${DEVFILES}