From 564b827f6d23fe65f9094ec4aad477ad755a8e27 Mon Sep 17 00:00:00 2001
From: ehouse <ehouse@0782aaa5-4710-0410-8820-a96bf9123855>
Date: Thu, 18 Sep 2008 03:55:04 +0000
Subject: [PATCH] Make new FAA 4.1 the default Spanish dictionary source; build
 three dicts (8, 9 and 15) by default (all: target).

---
 xwords4/dawg/Makefile.langcommon | 8 +++++---
 xwords4/dawg/Spanish/Makefile    | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/xwords4/dawg/Makefile.langcommon b/xwords4/dawg/Makefile.langcommon
index a712cc859..0553d144e 100644
--- a/xwords4/dawg/Makefile.langcommon
+++ b/xwords4/dawg/Makefile.langcommon
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
+XWLANG := $(XWLANG)_
+
 FRANK_EXT = xwd
 
 # This is now on for all dicts and languages. dict2dawg.pl can't
@@ -69,7 +71,7 @@ else
 PDBTYPE = Xwr3
 endif
 
-all: $(XWLANG)2to8.pdb
+all: $(XWLANG)2to8.pdb $(XWLANG)2to9.pdb $(XWLANG)2to15.pdb
 
 empty: $(XWLANG)0to0.pdb
 
@@ -142,7 +144,7 @@ ifeq ($(TARGET_TYPE),FRANK)
 # platforms is a by-product).  But if the EBM tools aren't there, just
 # build the .xwd file.
 ifeq (x$(shell echo -n $$EBOOKMAN_SDK)x,xx)
-all: $(XWLANG)2to8.xwd
+all: $(XWLANG)2to8.xwd $(XWLANG)2to9.xwd $(XWLANG)2to15.xwd
 empty: $(XWLANG)0to0.xwd
 else
 all: checkARCH $(XWLANG)2to8.seb
@@ -174,7 +176,7 @@ else
 ifeq ($(TARGET_TYPE),WINCE)
 
 ### WINCE section here ###
-all: $(XWLANG)2to8.xwd
+all: $(XWLANG)2to8.xwd $(XWLANG)2to9.xwd $(XWLANG)2to15.xwd
 	../mkxwdcab.pl -f $<
 
 else
diff --git a/xwords4/dawg/Spanish/Makefile b/xwords4/dawg/Spanish/Makefile
index 141d0e74c..b789c17e4 100644
--- a/xwords4/dawg/Spanish/Makefile
+++ b/xwords4/dawg/Spanish/Makefile
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-XWLANG=Spanish
+XWLANG=Spanish_FAA_4_1
 LANGCODE=es_ES
 TARGET_TYPE ?= PALM
 
@@ -43,7 +43,7 @@ include ../Makefile.langcommon
 #$(LANG)Main.dict.gz: SpanishMain.dict.gz
 #	ln -s $< $@
 
-SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/XavSpanish.dict.gz
+SOURCEDICT ?= $(XWDICTPATH)/Spanish/FAA_4.1.txt.gz
 
 $(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile
 	zcat $< \