From 98456dd6521dd60c79904a55a97d632d4fe121de Mon Sep 17 00:00:00 2001 From: Eric House Date: Thu, 9 Dec 2010 21:22:14 -0800 Subject: [PATCH] fix to build dicts, wince/android format by default --- xwords4/dawg/English/Makefile.CSW | 6 +++--- xwords4/dawg/English/Makefile.OWL2 | 6 +++--- xwords4/dawg/English/Makefile.SOWPODS | 6 +++--- xwords4/dawg/Italian/Makefile | 2 +- xwords4/dawg/Polish/Makefile | 2 +- xwords4/dawg/Slovak/Makefile | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/xwords4/dawg/English/Makefile.CSW b/xwords4/dawg/English/Makefile.CSW index e1cda017e..fed7ba22a 100644 --- a/xwords4/dawg/English/Makefile.CSW +++ b/xwords4/dawg/English/Makefile.CSW @@ -1,4 +1,4 @@ -# -*- mode: makefile; compile-command: "make -f Makefile.COSD"; -*- +# -*- mode: makefile; compile-command: "make -f Makefile.CSW"; -*- # Copyright 2002 by Eric House (xwords@eehouse.org). All rights reserved. # # This program is free software; you can redistribute it and/or @@ -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=CO +XWLANG=CSW LANGCODE=en_US TARGET_TYPE=WINCE @@ -23,7 +23,7 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/English/COSD.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/English/CSW.dict.gz $(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr -d '\r' | tr [a-z] [A-Z] | grep -e "^[A-Z]\{2,15\}$$" | \ diff --git a/xwords4/dawg/English/Makefile.OWL2 b/xwords4/dawg/English/Makefile.OWL2 index ce7988a5a..9a2a2d415 100644 --- a/xwords4/dawg/English/Makefile.OWL2 +++ b/xwords4/dawg/English/Makefile.OWL2 @@ -15,9 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -XWLANG=OWL2 -LANGCODE=en_US -TARGET_TYPE?=PALM +XWLANG = OWL2 +LANGCODE = en_US +TARGET_TYPE ?= WINCE include ../Makefile.2to8 diff --git a/xwords4/dawg/English/Makefile.SOWPODS b/xwords4/dawg/English/Makefile.SOWPODS index d12476f32..4c4cfefd1 100644 --- a/xwords4/dawg/English/Makefile.SOWPODS +++ b/xwords4/dawg/English/Makefile.SOWPODS @@ -15,9 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -XWLANG=SOWPODS -LANGCODE=en_US -TARGET_TYPE=FRANK +XWLANG = SOWPODS +LANGCODE = en_US +TARGET_TYPE = WINCE include ../Makefile.2to8 diff --git a/xwords4/dawg/Italian/Makefile b/xwords4/dawg/Italian/Makefile index a0bbd1ad6..277943497 100644 --- a/xwords4/dawg/Italian/Makefile +++ b/xwords4/dawg/Italian/Makefile @@ -18,7 +18,7 @@ XWLANG=Italian LANGCODE=it_IT -TARGET_TYPE ?= PALM +TARGET_TYPE ?= WINCE include ../Makefile.2to8 diff --git a/xwords4/dawg/Polish/Makefile b/xwords4/dawg/Polish/Makefile index 3254bfefb..aae5e2736 100644 --- a/xwords4/dawg/Polish/Makefile +++ b/xwords4/dawg/Polish/Makefile @@ -29,7 +29,7 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/Polish/slowa.txt.gz +SOURCEDICT ?= $(XWDICTPATH)/Polish/slowa-utf8.txt.gz $(XWLANG)Main.dict.gz: $(SOURCEDICT) zcat $< | tr -d '\r' \ diff --git a/xwords4/dawg/Slovak/Makefile b/xwords4/dawg/Slovak/Makefile index e3ec376e7..62f0eba98 100644 --- a/xwords4/dawg/Slovak/Makefile +++ b/xwords4/dawg/Slovak/Makefile @@ -25,7 +25,7 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/Slovak/slovnik_scrabble.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/Slovak/slovak.dict.gz $(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr -d '\r' | \