1
0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-04 12:52:15 +00:00

Fixed device files building procedure. This makes

it possible to ``make all install'' in one pass.
This commit is contained in:
Ruslan Ermilov 2000-12-06 08:35:46 +00:00
parent 138e514cb5
commit 0727d1b5ba
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=69665
9 changed files with 10 additions and 55 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -11,8 +11,6 @@ DEVFILES= DESC \
CLEANFILES+= DESC
.include "../Makefile.inc"
DESC: DESC.in
-rm -f DESC
echo "res $(LJ4RES)" >DESC

View File

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

View File

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

View File

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