summaryrefslogtreecommitdiffstats
path: root/games
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>1998-10-17 11:44:28 +0000
committerbde <bde@FreeBSD.org>1998-10-17 11:44:28 +0000
commit9758c81c9f4c20ab883d2a73701921c764911950 (patch)
treeef6b4948b302052666546686f96ac4c8a9112f19 /games
parent8671c8b39b692862c6abd1f6a1221241ae58970b (diff)
downloadFreeBSD-src-9758c81c9f4c20ab883d2a73701921c764911950.zip
FreeBSD-src-9758c81c9f4c20ab883d2a73701921c764911950.tar.gz
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.
Diffstat (limited to 'games')
-rw-r--r--games/fortune/datfiles/Makefile24
1 files changed, 13 insertions, 11 deletions
diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index daeaeb1..3bd896e 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>
OpenPOWER on IntegriCloud