diff --git a/dawg/Danish/Makefile b/dawg/Danish/Makefile index d5a8d32d4..0e289f130 100644 --- a/dawg/Danish/Makefile +++ b/dawg/Danish/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. -LANG=Danish +XWLANG=Danish LANGCODE=da_DK TARGET_TYPE ?= PALM @@ -24,9 +24,9 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/$(LANG)/LarsDanish.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/LarsDanish.dict.gz -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr -d '\r' | tr [a-zåæø] [A-ZÅÆØ] | \ grep '[AEIOUÅÆØ]' | \ grep '^[A-PR-VX-ZÅÆØ]\+$$' | sort -u | \ @@ -36,7 +36,7 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb help: @echo 'make [SOURCEDICT=LarsDanish.dict.gz] [TARGET_TYPE=WINCE|PALM]' diff --git a/dawg/Dutch/Makefile b/dawg/Dutch/Makefile index 3e21543dc..21de34ba4 100644 --- a/dawg/Dutch/Makefile +++ b/dawg/Dutch/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. -LANG=Dutch +XWLANG=Dutch LANGCODE=nl_NL TARGET_TYPE ?= PALM @@ -24,9 +24,9 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/$(LANG)/Dutch__unofficial_alphabetical.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/Dutch__unofficial_alphabetical.dict.gz -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr -d '\r' | tr [a-zäöü] [A-ZÄÖÜ] | \ grep '[AEIOU]' | grep '^[A-Z]\+$$' | sort -u | \ gzip -c > $@ @@ -35,7 +35,7 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb help: @echo 'make [SOURCEDICT=Dutch__unofficial_alphabetical.dict.gz]' diff --git a/dawg/English/Makefile.BasEnglish b/dawg/English/Makefile.BasEnglish index 550f1b0b2..89f1567ec 100644 --- a/dawg/English/Makefile.BasEnglish +++ b/dawg/English/Makefile.BasEnglish @@ -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. -LANG=BasEnglish +XWLANG=BasEnglish LANGCODE=en_US #NEWDAWG=1 @@ -25,11 +25,11 @@ include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: BasEnglish.dict.gz +$(XWLANG)Main.dict.gz: BasEnglish.dict.gz ln -s $< $@ # Everything but creating of the Main.dict file is inherited from the # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/English/Makefile.Enable b/dawg/English/Makefile.Enable index 5160f41a7..937b66676 100644 --- a/dawg/English/Makefile.Enable +++ b/dawg/English/Makefile.Enable @@ -20,7 +20,7 @@ # then gzippped it. # -LANG=Enable +XWLANG=Enable LANGCODE=en_US TARGET_TYPE=FRANK @@ -28,7 +28,7 @@ include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: Enable1.txt.gz +$(XWLANG)Main.dict.gz: Enable1.txt.gz zcat $< | tr -d '\r' | tr [a-z] [A-Z] | grep -e "^[A-Z]\{2,15\}$$" | \ gzip -c > $@ @@ -36,4 +36,4 @@ $(LANG)Main.dict.gz: Enable1.txt.gz # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/English/Makefile.OWL2 b/dawg/English/Makefile.OWL2 index 41b7ad745..41479a843 100644 --- a/dawg/English/Makefile.OWL2 +++ b/dawg/English/Makefile.OWL2 @@ -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. -LANG=OWL2_ +XWLANG=OWL2_ LANGCODE=en_US TARGET_TYPE=PALM @@ -25,7 +25,7 @@ include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/English/OWL2.dict.gz -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr -d '\r' | tr [a-z] [A-Z] | grep -e "^[A-Z]\{2,15\}$$" | \ gzip -c > $@ @@ -33,4 +33,4 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/English/Makefile.SOWPODS b/dawg/English/Makefile.SOWPODS index 2c680e6d0..d12476f32 100644 --- a/dawg/English/Makefile.SOWPODS +++ b/dawg/English/Makefile.SOWPODS @@ -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. -LANG=SOWPODS +XWLANG=SOWPODS LANGCODE=en_US TARGET_TYPE=FRANK @@ -25,7 +25,7 @@ include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/English/sow-twl.txt.gz -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr -d '\r' | tr [a-z] [A-Z] | grep -e "^[A-Z]\{2,15\}$$" | \ gzip -c > $@ @@ -33,4 +33,4 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/French/Makefile b/dawg/French/Makefile index 305d53796..e7ba219ae 100644 --- a/dawg/French/Makefile +++ b/dawg/French/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. -LANG=French +XWLANG=French LANGCODE=fr_FR TARGET_TYPE ?= FRANK @@ -24,11 +24,11 @@ include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: ods3.txt.gz +$(XWLANG)Main.dict.gz: ods3.txt.gz zcat $< | tr a-z A-Z | gzip >$@ # Everything but creating of the Main.dict file is inherited from the # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/French/Makefile.ODS4 b/dawg/French/Makefile.ODS4 index 57946cdc1..2851350bf 100644 --- a/dawg/French/Makefile.ODS4 +++ b/dawg/French/Makefile.ODS4 @@ -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. -LANG=ODS4_ +XWLANG=ODS4_ LANGCODE=fr_FR TARGET_TYPE ?= PALM @@ -24,11 +24,11 @@ include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: $(XWDICTPATH)/$(LANG)/ods4c.txt.gz +$(XWLANG)Main.dict.gz: $(XWDICTPATH)/$(XWLANG)/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 # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/German/Makefile b/dawg/German/Makefile index 5a8b4630b..6452bcfbd 100644 --- a/dawg/German/Makefile +++ b/dawg/German/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. -LANG=German +XWLANG=German LANGCODE=de_DE TARGET_TYPE ?= PALM @@ -24,9 +24,9 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/$(LANG)/HansGerman.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/HansGerman.dict.gz -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr [a-zäöü] [A-ZÄÖÜ] | \ sed -e 's/ß/SS/g' | \ grep '[AEIOUÄÖÜ]' | grep '^[A-ZÄÖÜ]\+$$' | \ @@ -36,7 +36,7 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb help: @echo 'make [SOURCEDICT=HansGerman.dict.gz|deutsch.dict.gz]' diff --git a/dawg/Hex/Makefile b/dawg/Hex/Makefile index 783a486e2..cf710fa59 100644 --- a/dawg/Hex/Makefile +++ b/dawg/Hex/Makefile @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -LANG = Hex +XWLANG = Hex LANGCODE = hex TARGET_TYPE = WINCE @@ -28,7 +28,7 @@ DICT ?= $(XWDICTPATH)/English/SOWPODS_official.txt.gz # Feel free to base this on whatever dictionary you have at hand. I'm # using CollegeEng for no particular reason. -$(LANG)Main.dict.gz: $(DICT) +$(XWLANG)Main.dict.gz: $(DICT) @echo "building $@ from $<" zcat $< | tr [a-f] [A-F] | grep -e '^[A-F]\{2,8\}$$' | \ echo CAFEBABE DEADBEEF $$(cat -) | \ @@ -38,4 +38,4 @@ $(LANG)Main.dict.gz: $(DICT) # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/Italian/Makefile b/dawg/Italian/Makefile index 9a5c64cc2..d1ff35cb2 100644 --- a/dawg/Italian/Makefile +++ b/dawg/Italian/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. -LANG=Italian +XWLANG=Italian LANGCODE=it_IT TARGET_TYPE ?= PALM @@ -24,11 +24,11 @@ include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: $(XWDICTPATH)/$(LANG)/ITALIANO.txt.gz +$(XWLANG)Main.dict.gz: $(XWDICTPATH)/$(XWLANG)/ITALIANO.txt.gz zcat $< | tr a-z A-Z | grep '^[A-IL-VZ]*$$' | gzip >$@ # Everything but creating of the Main.dict file is inherited from the # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/Makefile.langcommon b/dawg/Makefile.langcommon index fd8979086..5a1e1ffeb 100644 --- a/dawg/Makefile.langcommon +++ b/dawg/Makefile.langcommon @@ -67,9 +67,9 @@ else PDBTYPE = Xwr3 endif -all: $(LANG)2to8.pdb +all: $(XWLANG)2to8.pdb -empty: $(LANG)0to0.pdb +empty: $(XWLANG)0to0.pdb # Those languages that have bitmap files for custom glyphs will need to # define BMPBINFILES and perhaps provide a rule for building the files @@ -102,7 +102,7 @@ palmvalues.bin: values.bin palmspecials.bin # unsigned char reserved[3]; // worst case this points to a new resource # include "flags" as used on the other platforms -palmheader%.bin: $(LANG)%_wordcount.bin $(LANG)%_flags.bin +palmheader%.bin: $(XWLANG)%_wordcount.bin $(XWLANG)%_flags.bin rm -f $@ touch $@ cat $< >> $@ @@ -111,7 +111,7 @@ palmheader%.bin: $(LANG)%_wordcount.bin $(LANG)%_flags.bin perl -e "print pack(\"C\",2)" >> $@ # valTable rec number perl -e "print pack(\"CCC\",0)" >> $@ # reserved 3 bytes ifdef NEWDAWG - cat $(LANG)$*_flags.bin >> $@ + cat $(XWLANG)$*_flags.bin >> $@ else perl -e "print pack(\"CC\",0)" >> $@ # c code added two more... endif @@ -119,10 +119,10 @@ endif # This works, but leaves out the header info that the current version # has. I'm not sure anybody cares, though... -$(LANG)%.pdb: dawg$(LANG)%.stamp table.bin palmvalues.bin palmheader%.bin +$(XWLANG)%.pdb: dawg$(XWLANG)%.stamp table.bin palmvalues.bin palmheader%.bin $(PAR) c -a backup $@ \ $(basename $(@F)) $(PALM_DICT_TYPE) $(PDBTYPE) \ - palmheader$*.bin table.bin palmvalues.bin dawg$(LANG)$*_*.bin + palmheader$*.bin table.bin palmvalues.bin dawg$(XWLANG)$*_*.bin # the files to export for byod byodbins: table.bin values.bin palmvalues.bin info.txt @@ -140,11 +140,11 @@ 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: $(LANG)2to8.xwd -empty: $(LANG)0to0.xwd +all: $(XWLANG)2to8.xwd +empty: $(XWLANG)0to0.xwd else -all: checkARCH $(LANG)2to8.seb -empty: $(LANG)0to0.seb +all: checkARCH $(XWLANG)2to8.seb +empty: $(XWLANG)0to0.seb include ${EBOOKMAN_SDK}/ebsdk.uses endif @@ -153,13 +153,13 @@ checkARCH: $(error "ARCH must be defined in ENV if TARGET_TYPE==FRANK"); \ fi -$(LANG)%.seb: $(LANG)%.$(FRANK_EXT) $(LANG)%.atts +$(XWLANG)%.seb: $(XWLANG)%.$(FRANK_EXT) $(XWLANG)%.atts ${ESDK_CREATESEB_EXE} $< cp $< $<.saved -$(LANG)%.atts: #recreate it each time based on params +$(XWLANG)%.atts: #recreate it each time based on params echo '_PUB|global+read-only|"Eric_House"' >> $@ - echo "_NAME|global+read-only|\"$(LANG)2to8\"" >> $@ + echo "_NAME|global+read-only|\"$(XWLANG)2to8\"" >> $@ echo "_EXT|global+read-only|\"$(FRANK_EXT)\"" >> $@ echo '_LCAT|nosign+global|"CONTENT"' >> $@ echo '_PERM|global+read-only|"r"' >> $@ @@ -172,7 +172,7 @@ else ifeq ($(TARGET_TYPE),WINCE) ### WINCE section here ### -all: $(LANG)2to8.xwd +all: $(XWLANG)2to8.xwd ../mkxwdcab.pl -f $< else @@ -204,14 +204,14 @@ else perl -e "print pack(\"c\",$$siz)" > $@ endif -$(LANG)%.$(FRANK_EXT): dawg$(LANG)%.stamp $(LANG)%_flags.bin charcount.bin table.bin values.bin frankspecials.bin - cat $(LANG)$*_flags.bin charcount.bin table.bin values.bin \ - frankspecials.bin $(LANG)StartLoc.bin \ - $$(ls dawg$(LANG)$*_*.bin) > $@ +$(XWLANG)%.$(FRANK_EXT): dawg$(XWLANG)%.stamp $(XWLANG)%_flags.bin charcount.bin table.bin values.bin frankspecials.bin + cat $(XWLANG)$*_flags.bin charcount.bin table.bin values.bin \ + frankspecials.bin $(XWLANG)StartLoc.bin \ + $$(ls dawg$(XWLANG)$*_*.bin) > $@ cp $@ saveme.bin -# For some reason I can't fathom dawg$(LANG)% gets nuked every time +# For some reason I can't fathom dawg$(XWLANG)% gets nuked every time # the top-level rule fires (all: for whatever TARGET_TYPE.) It # happens after the rule finishes.... @@ -220,34 +220,34 @@ $(LANG)%.$(FRANK_EXT): dawg$(LANG)%.stamp $(LANG)%_flags.bin charcount.bin table # 1: old-style DAWG. # 2: new-style DAWG, three bytes per node. # 3: new-style DAWG, four bytes per node -$(LANG)%_flags.bin: dawg$(LANG)%.stamp +$(XWLANG)%_flags.bin: dawg$(XWLANG)%.stamp ifdef NEWDAWG - if [ 3 = $$(cat $(LANG)$*_nodesize.bin) ] ; \ + if [ 3 = $$(cat $(XWLANG)$*_nodesize.bin) ] ; \ then perl -e "print pack(\"n\",0x0002)" > $@; echo "flags=2"; \ - elif [ 4 = $$(cat $(LANG)$*_nodesize.bin) ] ; \ + elif [ 4 = $$(cat $(XWLANG)$*_nodesize.bin) ] ; \ then perl -e "print pack(\"n\",0x0003)" > $@; echo "flags=3"; \ elif true; \ then echo "Unexpected node size"; exit 1; \ fi else - if [ 3 == $$(cat $(LANG)$*_nodesize.bin) ] ; \ + if [ 3 == $$(cat $(XWLANG)$*_nodesize.bin) ] ; \ then perl -e "print pack(\"n\",0x0001)" > $@; echo "flags=1"; \ else echo "ERROR: old format can't handle 4-byte"; exit 1; \ fi endif -dawg$(LANG)%.stamp: $(LANG)Main.dict.gz $(DICT2DAWG) table.bin ../Makefile.langcommon - start=$$(echo $@ | sed -e 's/dawg$(LANG)\([0-9]*\)to[0-9]*.stamp/\1/'); \ - end=$$(echo $@ | sed -e 's/dawg$(LANG)[0-9]*to\([0-9]*\).stamp/\1/'); \ +dawg$(XWLANG)%.stamp: $(XWLANG)Main.dict.gz $(DICT2DAWG) table.bin ../Makefile.langcommon + start=$$(echo $@ | sed -e 's/dawg$(XWLANG)\([0-9]*\)to[0-9]*.stamp/\1/'); \ + end=$$(echo $@ | sed -e 's/dawg$(XWLANG)[0-9]*to\([0-9]*\).stamp/\1/'); \ echo $${start} and $$end; \ zcat $< | grep "^.\{$${start},$${end}\}$$" | \ sort -u | $(DICT2DAWG) $(TABLE_ARG) table.bin -b 28000 \ - -ob dawg$(LANG)$* \ - -sn $(LANG)StartLoc.bin -k -term 10 -wc $(LANG)$*_wordcount.bin \ - $(FORCE_4) -ns $(LANG)$*_nodesize.bin + -ob dawg$(XWLANG)$* \ + -sn $(XWLANG)StartLoc.bin -k -term 10 -wc $(XWLANG)$*_wordcount.bin \ + $(FORCE_4) -ns $(XWLANG)$*_nodesize.bin touch $@ -$(LANG)%_wordcount.bin: dawg$(LANG)%.stamp +$(XWLANG)%_wordcount.bin: dawg$(XWLANG)%.stamp @echo # the files to export for byod @@ -270,8 +270,8 @@ values.bin: ../xloc.pl zcat $< > $@ clean_common: - rm -f $(LANG)Main.dict *.bin *.pdb *.seb dawg*.stamp *.$(FRANK_EXT) \ - $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict *.bin *.pdb *.seb dawg*.stamp *.$(FRANK_EXT) \ + $(XWLANG)*.pdb $(XWLANG)*.seb help: @echo "make TARGET_TYPE=[FRANK|PALM]" diff --git a/dawg/Polish/Makefile b/dawg/Polish/Makefile index 56211ae1b..3cfd60d1f 100644 --- a/dawg/Polish/Makefile +++ b/dawg/Polish/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. -LANG=Polish +XWLANG=Polish LANGCODE=pl_PL TARGET_TYPE ?= FRANK @@ -24,7 +24,7 @@ include ../Makefile.2to8 include ../Makefile.langcommon -$(LANG)Main.dict.gz: slowa.txt.gz +$(XWLANG)Main.dict.gz: slowa.txt.gz zcat $< | tr -d '\r' | tr [a-z±æê³ñ󶼿] [A-Z¡ÆÊ£ÑÓ¦¬¯] | \ grep '^[A-PR-UWYZ¡ÆÊ£ÑÓ¦¬¯]*$$' | gzip >$@ @@ -32,4 +32,4 @@ $(LANG)Main.dict.gz: slowa.txt.gz # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb diff --git a/dawg/Portuguese/Makefile.Minho b/dawg/Portuguese/Makefile.Minho index c62bdcfc9..f4aef74f8 100644 --- a/dawg/Portuguese/Makefile.Minho +++ b/dawg/Portuguese/Makefile.Minho @@ -16,7 +16,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -LANG=PortuguesePT +XWLANG=PortuguesePT LANGCODE=pt_PT TARGET_TYPE ?= PALM @@ -27,7 +27,7 @@ include ../Makefile.langcommon SOURCEDICT ?= $(XWDICTPATH)/Portuguese/portuguese_pt.bz2 -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile.Minho +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile.Minho bzcat $< | tr [a-zç] [A-ZÇ] | \ grep '^[A-JL-VXZÇ]\+$$' | \ gzip -c > $@ @@ -36,7 +36,7 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile.Minho # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb help: @echo "make [SOURCEDICT=$(XWDICTPATH)/Portuguese/portuguese_pt.bz2]" diff --git a/dawg/Spanish/Makefile b/dawg/Spanish/Makefile index 2e00f75f1..d937189f8 100644 --- a/dawg/Spanish/Makefile +++ b/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. -LANG=Spanish +XWLANG=Spanish LANGCODE=es_ES TARGET_TYPE ?= PALM @@ -43,7 +43,7 @@ include ../Makefile.langcommon #$(LANG)Main.dict.gz: SpanishMain.dict.gz # ln -s $< $@ -$(LANG)Main.dict.gz: $(XWDICTPATH)/$(LANG)/XavSpanish.dict.gz Makefile +$(XWLANG)Main.dict.gz: $(XWDICTPATH)/$(XWLANG)/XavSpanish.dict.gz Makefile zcat $< \ | tr '\207\216\222\227\234\237\226' 'aeiouu\321' \ | tr [a-zñ] [A-ZÑ] \ diff --git a/dawg/Swedish/Makefile b/dawg/Swedish/Makefile index 2b08254ea..fadbfdc68 100644 --- a/dawg/Swedish/Makefile +++ b/dawg/Swedish/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. -LANG=Swedish +XWLANG=Swedish LANGCODE=sv_SE # Swedish has too many chars for the old format. @@ -27,12 +27,12 @@ include ../Makefile.2to8 include ../Makefile.langcommon -SOURCEDICT ?= $(XWDICTPATH)/$(LANG)/swedish15.dict.gz +SOURCEDICT ?= $(XWDICTPATH)/$(XWLANG)/swedish15.dict.gz # Q and W are not available as tiles, but I'm told there's a custom in # Swedish play of allowing blanks to stand for those letters as well. # So we don't exclude words with those letters from the dictionary. -$(LANG)Main.dict.gz: $(SOURCEDICT) Makefile +$(XWLANG)Main.dict.gz: $(SOURCEDICT) Makefile zcat $< | tr [a-zäåæöü] [A-ZÄÅÆÖÜ] | \ grep '^[A-ZÄÅÆÖÜ]\{2,15\}$$' | \ gzip -c > $@ @@ -41,5 +41,5 @@ $(LANG)Main.dict.gz: $(SOURCEDICT) Makefile # "parent" Makefile.langcommon in the parent directory. clean: clean_common - rm -f $(LANG)Main.dict.gz *.bin $(LANG)*.pdb $(LANG)*.seb + rm -f $(XWLANG)Main.dict.gz *.bin $(XWLANG)*.pdb $(XWLANG)*.seb