diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-10-17 11:44:28 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-10-17 11:44:28 +0000 |
| commit | 353f3cf0a651f5d948d57a910e93d65499da44ae (patch) | |
| tree | fa96f17d0cae5a61948206f3d3d7cf1db3aa69ac /games | |
| parent | ae99ddc79ef9414acb08bfd6f4a882f5bb3a4e1b (diff) | |
| download | src-353f3cf0a651f5d948d57a910e93d65499da44ae.tar.gz src-353f3cf0a651f5d948d57a910e93d65499da44ae.zip | |
Fixed building without /usr/games in $PATH. Just add /usr/games
to the _end_ of $PATH before using tools that are normally in
/usr/games. I broke this in rev.1.9 by assuming that these tools
are in $PATH (as they are for `make world' unless NOTOOLS is set).
Revs.1.10-1.13 of this file had various wrong fixes. Rev.1.18
of src/Makefile.inc1 has an incomplete fix.
PR: 7936
Fixed comments about what to comment out to [not] install the
potentially offensive fortunes. This should be configured using
an ifdef.
Fixed missing dependencies of fortunes.dat on fortunes, etc.
Removed bogus dependency of `all' on source files.
Fixed some style bugs.
Notes
Notes:
svn path=/head/; revision=40478
Diffstat (limited to 'games')
| -rw-r--r-- | games/fortune/datfiles/Makefile | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile index daeaeb10e888..3bd896e1b4eb 100644 --- a/games/fortune/datfiles/Makefile +++ b/games/fortune/datfiles/Makefile @@ -4,34 +4,36 @@ FILES= fortunes fortunes2 startrek zippy BLDS= fortunes.dat fortunes2.dat startrek.dat zippy.dat \ fortunes-o fortunes-o.dat -# TO INSTALL THE POTENTIALLY OFFENSIVE FORTUNES, UNCOMMENT THE THREE -# LINES AND COMMENT OUT THE FOURTH LINE. +# TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, COMMENT OUT THE +# THREE LINES AND UNCOMMENT THE FOURTH LINE. -# THE THREE LINES +# THE THREE LINES: FILES+= fortunes2-o limerick BLDS+= fortunes2-o.dat limerick.dat TYPE= real -# THE FOURTH LINE +# THE FOURTH LINE: #TYPE= fake CLEANFILES+=${BLDS} -all: ${FILES} ${BLDS} +all: ${BLDS} -install: +beforeinstall: (cd ${.CURDIR} && ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \ - -m ${NOBINMODE} ${FILES} ${DESTDIR}${SHAREDIR}/games/fortune) + -m ${NOBINMODE} ${FILES} ${DESTDIR}${SHAREDIR}/games/fortune) ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} ${BLDS} \ ${DESTDIR}${SHAREDIR}/games/fortune -fortunes.dat fortunes2.dat fortunes2-o.dat limerick.dat startrek.dat zippy.dat: - strfile -rs ${.CURDIR}/${.TARGET:R} ${.TARGET} +.for f in fortunes fortunes2 fortunes2-o limerick startrek zippy +$f.dat: $f + PATH=$$PATH:/usr/games strfile -rs ${.ALLSRC} ${.TARGET} +.endfor fortunes-o.dat: fortunes-o - strfile -rsx fortunes-o ${.TARGET} + PATH=$$PATH:/usr/games strfile -rsx ${.ALLSRC} ${.TARGET} fortunes-o: fortunes-o.${TYPE} - caesar 13 < ${.ALLSRC} > ${.TARGET} + PATH=$$PATH:/usr/games caesar 13 < ${.ALLSRC} > ${.TARGET} .include <bsd.prog.mk> |