Fixed device files building procedure. This makes

it possible to ``make all install'' in one pass.

2 files changed, 3 insertions, 21 deletions

diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 3f9d506..dcff4f8 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 6d27a3b..94ca32e 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}