Don't put [] around the strings passed to tr -- those can be interpreted

[bsdgames-darwin.git] / fortune / datfiles / Makefile

diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile
index 745a62b4005693a7ee732e155e314e8fe0ddba4b..649b3cb3cd8ad4d7027e9320b92f59a339d6d847 100644 (file)
--- a/fortune/datfiles/Makefile
+++ b/fortune/datfiles/Makefile
@@ -1,14 +1,15 @@
-#      $NetBSD: Makefile,v 1.28 2000/08/17 16:48:52 abs Exp $
+#      $NetBSD: Makefile,v 1.32 2002/01/30 19:41:39 tv Exp $
 #      @(#)Makefile    8.2 (Berkeley) 4/19/94
 
 .include <bsd.own.mk>                  # for INSTALL_OFFENSIVE_FORTUNES
 
 SRCFILES=      fortunes fortunes2 startrek zippy unamerican-o limerick \
-               netbsd
+               netbsd farber
 DATFILES=      fortunes.dat fortunes2.dat startrek.dat zippy.dat \
                fortunes-o fortunes-o.dat fortunes2-o fortunes2-o.dat \
-               limerick.dat limerick-o.dat unamerican-o unamerican-o.dat \
-               netbsd.dat netbsd-o netbsd-o.dat
+               limerick.dat limerick-o limerick-o.dat unamerican-o \
+               unamerican-o.dat netbsd.dat netbsd-o netbsd-o.dat \
+               farber.dat
 
 # TO AVOID INSTALLING THE POTENTIALLY OFFENSIVE FORTUNES, RUN 'make' with
 # "INSTALL_OFFENSIVE_FORTUNES=NO", or set "INSTALL_OFFENSIVE_FORTUNES=NO"
@@ -23,8 +24,8 @@ TYPE=         fake
 
 CLEANFILES+=${DATFILES} limerick-o
 
-STRFILE!=cd $(.CURDIR)/../strfile; \
-       printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/strfile\n" | ${MAKE} -s -f-
+STRFILEDIR!=cd $(.CURDIR)/../strfile; ${PRINTOBJDIR}
+STRFILE=${STRFILEDIR}/strfile
 
 .if ${MKSHARE} != "no"
 FILES=${SRCFILES} ${DATFILES}
@@ -35,7 +36,7 @@ realall: ${DATFILES}
 
 # Normal fortunes: build directly from data files.
 
-fortunes.dat fortunes2.dat startrek.dat zippy.dat limerick.dat netbsd.dat:
+fortunes.dat fortunes2.dat startrek.dat zippy.dat limerick.dat netbsd.dat farber.dat:
        ${STRFILE} -rs ${.CURDIR}/${.TARGET:R} ${.TARGET}
 fortunes.dat:  fortunes
 fortunes2.dat: fortunes2
@@ -43,31 +44,32 @@ startrek.dat:       startrek
 zippy.dat:     zippy
 limerick.dat:  limerick
 netbsd.dat:    netbsd
+farber.dat:    farber
 
 # Obscene fortunes: we have to build source and data files
 
 fortunes-o: fortunes-o.${TYPE}
-       tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
+       tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET}
 fortunes-o.dat: fortunes-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
 fortunes2-o: fortunes2-o.${TYPE}
-       tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
+       tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET}
 fortunes2-o.dat: fortunes2-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
 limerick-o: limerick-o.${TYPE}
-       tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
+       tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET}
 limerick-o.dat: limerick-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
 unamerican-o: unamerican-o.${TYPE}
-       tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
+       tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET}
 unamerican-o.dat: unamerican-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}
 
 netbsd-o: netbsd-o.${TYPE}
-       tr [a-zA-Z] [n-za-mN-ZA-M] < ${.ALLSRC} > ${.TARGET}
+       tr 'a-zA-Z' 'n-za-mN-ZA-M' < ${.ALLSRC} > ${.TARGET}
 netbsd-o.dat: netbsd-o
        ${STRFILE} -rsx ${.ALLSRC} ${.TARGET}