Use the installed versions of caesar and strfile. They are now

bootstrapped by `make world', and the installed versions are just
as likely to work as the installed version of cc if `make' is run
directly.

1 files changed, 3 insertions, 19 deletions

diff --git a/games/fortune/datfiles/Makefile b/games/fortune/datfiles/Makefile
index e0b1478..daeaeb1 100644
--- a/games/fortune/datfiles/Makefile
+++ b/games/fortune/datfiles/Makefile
@@ -15,22 +15,6 @@ TYPE=	real
 # THE FOURTH LINE
 #TYPE=	fake
 
-.if exists(${.OBJDIR}/../../caesar/caesar)
-CAESAR=${.OBJDIR}/../../caesar/caesar
-.elif exists(${.CURDIR}/../../caesar/caesar)
-CAESAR=${.CURDIR}/../../caesar/caesar
-.else
-CAESAR=/usr/games/caesar
-.endif
-
-.if exists(${.OBJDIR}/../strfile/strfile)
-STRFILE=${.OBJDIR}/../strfile/strfile
-.elif exists(${.CURDIR}/../strfile/strfile)
-STRFILE=${.CURDIR}/../strfile/strfile
-.else
-STRFILE=/usr/games/strfile
-.endif
-
 CLEANFILES+=${BLDS}
 
 all: ${FILES} ${BLDS}
@@ -42,12 +26,12 @@ install:
 	    ${DESTDIR}${SHAREDIR}/games/fortune
 
 fortunes.dat fortunes2.dat fortunes2-o.dat limerick.dat startrek.dat zippy.dat:
-	${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET}
+	strfile -rs ${.CURDIR}/${.TARGET:R} ${.TARGET}
 
 fortunes-o.dat: fortunes-o
-	${STRFILE} -rsx fortunes-o ${.TARGET}
+	strfile -rsx fortunes-o ${.TARGET}
 
 fortunes-o: fortunes-o.${TYPE}
-	${CAESAR} 13 < ${.ALLSRC} > ${.TARGET}
+	caesar 13 < ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>