From b24837669dde22601ae0cfdff18e8dadcfc8900b Mon Sep 17 00:00:00 2001 From: ehouse Date: Fri, 5 Nov 2004 14:24:47 +0000 Subject: [PATCH] TARGET_TYPE to PALM; use env variable to locate input wordlist --- xwords4/dawg/French/Makefile.ODS4 | 6 +++--- xwords4/dawg/German/Makefile | 4 ++-- xwords4/dawg/Spanish/Makefile | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xwords4/dawg/French/Makefile.ODS4 b/xwords4/dawg/French/Makefile.ODS4 index 15075f9f2..a548e888d 100644 --- a/xwords4/dawg/French/Makefile.ODS4 +++ b/xwords4/dawg/French/Makefile.ODS4 @@ -15,16 +15,16 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -LANG=ODS4 +LANG=ODS4_ LANGCODE=fr_FR -TARGET_TYPE ?= FRANK +TARGET_TYPE ?= PALM include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: ods4.txt.gz +$(LANG)Main.dict.gz: $(XWDICTPATH)/$(LANG)/ods4c.txt.gz zcat $< | tr a-z A-Z | tr -d '\r' | gzip >$@ # Everything but creating of the Main.dict file is inherited from the diff --git a/xwords4/dawg/German/Makefile b/xwords4/dawg/German/Makefile index da7973984..488b5fed7 100644 --- a/xwords4/dawg/German/Makefile +++ b/xwords4/dawg/German/Makefile @@ -18,13 +18,13 @@ LANG=German LANGCODE=de_DE -TARGET_TYPE ?= FRANK +TARGET_TYPE ?= PALM include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= HansGerman.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/$(LANG)/HansGerman.dict.gz $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr [a-zäöü] [A-ZÄÖÜ] | \ diff --git a/xwords4/dawg/Spanish/Makefile b/xwords4/dawg/Spanish/Makefile index 04d063e4c..7f91f15aa 100644 --- a/xwords4/dawg/Spanish/Makefile +++ b/xwords4/dawg/Spanish/Makefile @@ -17,7 +17,7 @@ LANG=Spanish LANGCODE=es_ES -TARGET_TYPE ?= FRANK +TARGET_TYPE ?= PALM ifeq ($(TARGET_TYPE),PALM) PBITMS = ./bmps/palm @@ -39,7 +39,7 @@ include ../Makefile.langcommon #$(LANG)Main.dict.gz: SpanishMain.dict.gz # ln -s $< $@ -$(LANG)Main.dict.gz: XavSpanish.dict.gz Makefile +$(LANG)Main.dict.gz: $(XWDICTPATH)/$(LANG)/XavSpanish.dict.gz Makefile zcat $< \ | tr '\207\216\222\227\234\237\226' 'aeiouu\321' \ | tr [a-zñ] [A-ZÑ] \