Index: conf/Makefile
===================================================================
--- conf/Makefile	(revision b242df28e54a297520242fa6f8f1d8ec891f6658)
+++ conf/Makefile	(revision abd28d16d662215e73293143d3773397f219ea93)
@@ -2,8 +2,8 @@
 
 .PHONY: all
-all: compiledic.conf cor.conf dgc.conf dgp.conf gph.conf grp.conf gue.conf kor.conf lem.conf mar.conf ser.conf utt.conf
+all: compdic.conf cor.conf dgc.conf dgp.conf gph.conf grp.conf gue.conf kor.conf lem.conf mar.conf ser.conf utt.conf
 
 %.conf: %.conf.m4
-	m4 --define=LANG_DIR=${LANG_DIR} --define=LIB_DIR=${LIB_DIR} $< > $@
+	m4 --define=LANG_DIR=${LANG_DIR} --define=LIB_DIR=${LIB_DIR} --define=LANGUAGE=${LANGUAGE} $< > $@
 
 
Index: conf/compdic.conf.m4
===================================================================
--- conf/compdic.conf.m4	(revision abd28d16d662215e73293143d3773397f219ea93)
+++ conf/compdic.conf.m4	(revision abd28d16d662215e73293143d3773397f219ea93)
@@ -0,0 +1,13 @@
+# ************************************************************
+# * This file was created automatically during installation. *
+# * If you don't need do not change it.                      *
+# *                                                          *
+# * UAM Text Tools                                           *
+# * Adam Mickiewicz University, Poland                       *
+# * http://utt.amu.edu.pl                                    *
+# ************************************************************
+#
+# All lines must looks like:
+# parameter_name [=] value
+#
+symbols = LANG_DIR/LANGUAGE/LANGUAGE.sym
Index: conf/compiledic.conf.m4
===================================================================
--- conf/compiledic.conf.m4	(revision cfdf333a512778a753f04c7ce616075f6059e7bb)
+++ 	(revision )
@@ -1,13 +1,0 @@
-# ************************************************************
-# * This file was created automatically during installation. *
-# * If you don't need do not change it.                      *
-# *                                                          *
-# * UAM Text Tools                                           *
-# * Adam Mickiewicz University, Poland                       *
-# * http://utt.amu.edu.pl                                    *
-# ************************************************************
-#
-# All lines must looks like:
-# parameter_name [=] value
-#
-symbols = LANG_DIR/pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym
Index: conf/dgc.conf.m4
===================================================================
--- conf/dgc.conf.m4	(revision cfdf333a512778a753f04c7ce616075f6059e7bb)
+++ conf/dgc.conf.m4	(revision abd28d16d662215e73293143d3773397f219ea93)
@@ -11,5 +11,5 @@
 # parameter_name [=] value
 #
-categories = LANG_DIR/cats.dgc
+categories = LANG_DIR/LANGUAGE/lem.bin.cats
 grammar = LANG_DIR/gram.dgc
 outputfile = LANG_DIR/gram.dgp
Index: conf/lem.conf.m4
===================================================================
--- conf/lem.conf.m4	(revision cfdf333a512778a753f04c7ce616075f6059e7bb)
+++ conf/lem.conf.m4	(revision abd28d16d662215e73293143d3773397f219ea93)
@@ -11,4 +11,5 @@
 # parameter_name [=] value
 #
-dictionary-home = LANG_DIR
+dictionary = LANG_DIR/LANGUAGE/lem.bin
+#dictionary-home = LANG_DIR
 process = W
Index: conf/utt.conf.m4
===================================================================
--- conf/utt.conf.m4	(revision cfdf333a512778a753f04c7ce616075f6059e7bb)
+++ conf/utt.conf.m4	(revision abd28d16d662215e73293143d3773397f219ea93)
@@ -12,3 +12,3 @@
 #
 # user locale (dictionary)
-language = pl_PL.ISO-8859-2
+language = LANGUAGE