From 5e4533fe6902073f005ad3ee186e9ed605e5c790 Mon Sep 17 00:00:00 2001
From: bde <bde@FreeBSD.org>
Date: Sat, 21 Oct 1995 16:26:38 +0000
Subject: Remove private maninstall target.  It will conflict with the one in
 bsd.man.mk when I change the latter to use `::' instead of `:' dependencies. 
 (bsd.man.mk is included because NOMAN isn't defined. The maninstall target is
 supposed to be private to bsd.man.mk so bsd.man.mk doesn't bother testing if
 it is already defined.  The test for redefinition in Makefile.dev was too
 early to do anything.)

Change install target to a beforeinstall target (perhaps there should
be an `extrainstall' target so that Makefiles don't have to abuse
one of beforeinstall, install, realinstall or afterinstall).  Don't
bother testing for the install target already being defined.  Rewrite
the shell loop as a make loop (this reduces the time for installing
groff from 78s to 65s here).
---
 gnu/usr.bin/groff/Makefile.dev      | 21 +++++++++------------
 gnu/usr.bin/groff/font/Makefile.dev | 21 +++++++++------------
 2 files changed, 18 insertions(+), 24 deletions(-)

(limited to 'gnu/usr.bin')

diff --git a/gnu/usr.bin/groff/Makefile.dev b/gnu/usr.bin/groff/Makefile.dev
index 36c3f30..2aa71f8 100644
--- a/gnu/usr.bin/groff/Makefile.dev
+++ b/gnu/usr.bin/groff/Makefile.dev
@@ -13,18 +13,15 @@ FONTMODE?=	444
 
 all:	$(FONTFILES)
 
-.if !target(maninstall)
-maninstall:
-	@echo -n
-.endif
-
-.if !target(install)
-install:
-	for f in $(FONTFILES); do \
-		ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \
-		$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
-			$(DESTDIR)$(DEVICEDIR)/$$f; \
-	done
+.for f in $(FONTFILES)
+.if exists($f)
+beforeinstall: $f
+.else
+beforeinstall: $(.CURDIR)/$f
 .endif
+.endfor
+beforeinstall:
+	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
+		${.ALLSRC} $(DESTDIR)$(DEVICEDIR)
 
 .include <bsd.prog.mk>
diff --git a/gnu/usr.bin/groff/font/Makefile.dev b/gnu/usr.bin/groff/font/Makefile.dev
index 36c3f30..2aa71f8 100644
--- a/gnu/usr.bin/groff/font/Makefile.dev
+++ b/gnu/usr.bin/groff/font/Makefile.dev
@@ -13,18 +13,15 @@ FONTMODE?=	444
 
 all:	$(FONTFILES)
 
-.if !target(maninstall)
-maninstall:
-	@echo -n
-.endif
-
-.if !target(install)
-install:
-	for f in $(FONTFILES); do \
-		ff=$$f; test -f $$f || ff=${.CURDIR}/$$f || true; \
-		$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) $$ff \
-			$(DESTDIR)$(DEVICEDIR)/$$f; \
-	done
+.for f in $(FONTFILES)
+.if exists($f)
+beforeinstall: $f
+.else
+beforeinstall: $(.CURDIR)/$f
 .endif
+.endfor
+beforeinstall:
+	$(INSTALL) -c -o $(FONTOWN) -g $(FONTGRP) -m $(FONTMODE) \
+		${.ALLSRC} $(DESTDIR)$(DEVICEDIR)
 
 .include <bsd.prog.mk>
-- 
cgit v1.1