- Don't depend on installed ${DESTDIR}/usr/share/dict/words; pick up the

  dictionary from the sources.
- Don't depend on the locally built indexing programs to build the dictionaries.

diff --git a/boggle/Makefile b/boggle/Makefile
index 7e42b913d380f88b5071eef14ecf1f909e4de4c7..8d7c859c175bfe633fcfc6b128d449939d737842 100644 (file)
--- a/boggle/Makefile
+++ b/boggle/Makefile
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 1997/03/24 22:15:38 christos Exp $
+#      $NetBSD: Makefile,v 1.8 1997/04/01 11:42:34 christos Exp $

 #      @(#)Makefile    8.1 (Berkeley) 6/11/93
 
 SUBDIR=        boggle mkdict mkindex
 #      @(#)Makefile    8.1 (Berkeley) 6/11/93
 
 SUBDIR=        boggle mkdict mkindex


@@ -7,7 +7,7 @@ MKDICT!=cd $(.CURDIR)/mkdict; \
        printf "xxx:\n\techo \$${.OBJDIR}/mkdict\n" | ${MAKE} -r -s -f - xxx
 MKINDEX!=cd $(.CURDIR)/mkindex; \
        printf "xxx:\n\techo \$${.OBJDIR}/mkindex\n" | ${MAKE} -r -s -f - xxx
        printf "xxx:\n\techo \$${.OBJDIR}/mkdict\n" | ${MAKE} -r -s -f - xxx
 MKINDEX!=cd $(.CURDIR)/mkindex; \
        printf "xxx:\n\techo \$${.OBJDIR}/mkindex\n" | ${MAKE} -r -s -f - xxx

-WORDS=${DESTDIR}/usr/share/dict/words
+WORDS=${.CURDIR}/../../share/dict/web2a

 FILES=dictionary dictindex
 FILESDIR=/usr/share/games/boggle
 CLEANFILES+=${FILES}
 FILES=dictionary dictindex
 FILESDIR=/usr/share/games/boggle
 CLEANFILES+=${FILES}


@@ -17,11 +17,11 @@ all: ${FILES}
 ${MKDICT} ${MKINDEX}: ${SUBDIR}
        
 
 ${MKDICT} ${MKINDEX}: ${SUBDIR}
        
 

-dictionary: ${MKDICT} ${WORDS}
+dictionary: ${WORDS}

        rm -f ${.TARGET}
        ${MKDICT} < ${WORDS} > ${.TARGET}
 
        rm -f ${.TARGET}
        ${MKDICT} < ${WORDS} > ${.TARGET}
 

-dictindex: ${MKINDEX} dictionary
+dictindex: dictionary

        rm -f ${.TARGET}
        ${MKINDEX} < dictionary > ${.TARGET}
 
        rm -f ${.TARGET}
        ${MKINDEX} < dictionary > ${.TARGET}