hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-16 07:11:05 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove private maninstall target. It will conflict with the one in

Browse Source 
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).
This commit is contained in:
Bruce Evans 1995-10-21 16:26:38 +00:00
parent b2105a0990
commit 02b537bd23
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=11619
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gnu/usr.bin/groff/Makefile.dev
View File

@ -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>

21
gnu/usr.bin/groff/font/Makefile.dev
View File

@ -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>