[Zaf-commit] SF.net SVN: zaf:[9985] trunk/dict/utils/Makefile.language

[<dwa...@us...>]

Revision: 9985
          http://zaf.svn.sourceforge.net/zaf/?rev=9985&view=rev
Author:   dwaynebailey
Date:     2009-12-09 14:35:14 +0000 (Wed, 09 Dec 2009)

Log Message:
-----------
Drop unalias stuff, it never actually worked
Pass more variabels properly to the oxt Makefiles

Modified Paths:
--------------
    trunk/dict/utils/Makefile.language

Modified: trunk/dict/utils/Makefile.language
===================================================================
--- trunk/dict/utils/Makefile.language	2009-12-09 14:33:01 UTC (rev 9984)
+++ trunk/dict/utils/Makefile.language	2009-12-09 14:35:14 UTC (rev 9985)
@@ -263,15 +263,14 @@
 
 # this does the work of converting a wordlist into a hunspell dictionary
 # it can take a while
-hunspell/$(LANG)_$(REGION)_unalias.dic: hunspell/wordlist.$(CHARSET) hunspell/$(LANG)_$(REGION)_unalias.aff $(HUNMUNCH_DEP)
-	$(HUNMUNCH) hunspell/wordlist.$(CHARSET) hunspell/$(LANG)_$(REGION)_unalias.aff >$@
+hunspell/$(LANG)_$(REGION)_unalias.dic: hunspell/wordlist.$(CHARSET) hunspell/$(LANG)_$(REGION).aff.in $(HUNMUNCH_DEP)
+	$(HUNMUNCH) hunspell/wordlist.$(CHARSET) hunspell/$(LANG)_$(REGION).aff.in >$@
 
 hunspell/$(LANG)_$(REGION).dic: hunspell/$(LANG)_$(REGION).aff
 
-hunspell/$(LANG)_$(REGION).aff: hunspell/$(LANG)_$(REGION)_unalias.aff hunspell/$(LANG)_$(REGION)_unalias.dic
-	../utils/hunmakealias hunspell/$(LANG)_$(REGION)_unalias.dic hunspell/$(LANG)_$(REGION)_unalias.aff
-	mv $(LANG)_$(REGION)_unalias_alias.dic hunspell/$(LANG)_$(REGION).dic
-	mv $(LANG)_$(REGION)_unalias_alias.aff hunspell/$(LANG)_$(REGION).aff
+hunspell/$(LANG)_$(REGION).aff: hunspell/$(LANG)_$(REGION).aff.in hunspell/$(LANG)_$(REGION)_unalias.dic
+	cp hunspell/$(LANG)_$(REGION)_unalias.dic hunspell/$(LANG)_$(REGION).dic
+	cp hunspell/$(LANG)_$(REGION).aff.in hunspell/$(LANG)_$(REGION).aff
 
 # Autocorrect rules
 
@@ -310,4 +309,4 @@
 # Target OXT depends on VERSION file.
 $(TARGET_OXT): ../VERSION-$(LANG)_$(REGION).voxt
 	mkdir -p oxt
-	$(MAKE) -C oxt -f ../../utils/Makefile.oxts DICT=$(DICTIONARY_OXT) LANG=$(LANG) REGION=$(REGION) VERSION=$(VERSION_OXT) LANGNAME=$(LANGNAME) REGIONNAME='$(REGIONNAME)'
+	$(MAKE) -C oxt -f ../../utils/Makefile.oxts DICT=$(DICTIONARY_OXT) LANG=$(LANG) REGION=$(REGION) VERSION=$(VERSION_OXT) LANGNAME='$(LANGNAME)' REGIONNAME='$(REGIONNAME)'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.