Index: app/dist/common/utt_make_config.pl
===================================================================
--- app/dist/common/utt_make_config.pl	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/dist/common/utt_make_config.pl	(revision e1b08a23fabf2d0009aa9fd3b32791257ac781c5)
@@ -1,38 +1,126 @@
-#!/usr/bin/perl
+#!c:\usr\perl\bin\perl.exe
 
 use Cwd 'abs_path';
 use File::Basename;
+use File::HomeDir;
+use File::Spec::Functions;
 use POSIX;
 
-my $cur_dir = dirname(abs_path($0));
+my $sys_home = catdir(dirname(abs_path($0)), "..");
+my $usr_home = catdir(home(), '.utt');
 
-open(FILE, ">$cur_dir/conf/utt.conf");
+prepareUttUsrHome($usr_home);
+conf_cor(catfile($usr_home, 'cor.conf'), $sys_home);
+conf_grp(catfile($usr_home, 'grp.conf'), $sys_home);
+conf_gue(catfile($usr_home, 'gue.conf'), $sys_home);
+conf_lem(catfile($usr_home, 'lem.conf'), $sys_home);
+conf_ser(catfile($usr_home, 'ser.conf'), $sys_home);
+conf_utt(catfile($usr_home, 'utt.conf'), $sys_home);
 
-# we put some description into utt.conf file
-print FILE "# ************************************************************\n";
-print FILE "# * This file was created automatically during installation. *\n";
-print FILE "# * If you don't need do not change it.                      *\n";
-print FILE "# *                                                          *\n";
-print FILE "# * UAM Text Tools                                           *\n";
-print FILE "# * Adam Mickiewicz University, Poland                       *\n";
-print FILE "# * http://utt.amu.edu.pl                                    *\n";
-print FILE "# ************************************************************\n";
-print FILE "\n\n";
-
-# we need utt home directory
-print FILE "# absolute path to utt directory\n";
-print FILE "UTT_HOME=$cur_dir\n\n";
-
-
-# we need user default locale
-$best_locale = findLocale();
-print FILE "# user locale\n";
-print FILE "UTT_LOCALE=$best_locale\n";
-print FILE "\n";
-
-close FILE;
+print "UTT user configuration created in $usr_home\n";
 
 
 
+#Kasuje stare configi i tworzy katalog .utt
+sub prepareUttUsrHome() {
+    my $dir = shift;
+
+	if(-d $dir) {
+		print "Old configuration will be deleted!\n";
+		my $cnt = unlink <$dir/*>;
+		print "$cnt files deleted.\n";
+	}
+	else {
+		print "Creating directory $dir\n";
+		if(1 != mkdir $dir) {
+		  die "Unable to create UTT user configuration!\n";
+		}
+	}
+}
+
+# Tworzy naglowek dla wszystkich plikow konfiguracyjnych
+sub makeConfigHeader() {
+  return "# ************************************************************\n".
+  		 "# * This file was created automatically during installation. *\n".
+		 "# * If you don't need do not change it.                      *\n".
+		 "# *                                                          *\n".
+		 "# * UAM Text Tools                                           *\n".
+		 "# * Adam Mickiewicz University, Poland                       *\n".
+		 "# * http://utt.amu.edu.pl                                    *\n".
+		 "# ************************************************************\n".
+		 "#\n".
+		 "# All lines must looks like:\n".
+		 "# parameter_name [=] value\n".
+		 "#\n\n";
+}
+
+sub conf_cor() {
+	my $cor_file = shift;
+	my $utthome = shift;
+  open(FILE, ">$cor_file");
+
+  print FILE makeConfigHeader();
+  print FILE "dictionary-home=", abs_path("$utthome/share/utt"), "\n";
+
+  close FILE;
+}
+
+sub conf_grp() {
+	my $grp_file = shift;
+	my $utthome = shift;
+  open(FILE, ">$grp_file");
+
+  print FILE makeConfigHeader();
+  print FILE "macros=", abs_path("$utthome/lib/utt/terms.m4"), "\n";
+
+  close FILE;
+}
+
+sub conf_gue() {
+	my $gue_file = shift;
+	my $utthome = shift;
+  open(FILE, ">$gue_file");
+
+  print FILE makeConfigHeader();
+
+  close FILE;
+}
+
+sub conf_lem() {
+	my $lem_file = shift;
+	my $utthome = shift;
+  open(FILE, ">$lem_file");
+
+  print FILE makeConfigHeader();
+  print FILE "dictionary-home=", abs_path("$utthome/share/utt"), "\n";
+
+  close FILE;
+}
+
+sub conf_ser() {
+	my $ser_file = shift;
+	my $utthome = shift;
+  open(FILE, ">$ser_file");
+
+  print FILE makeConfigHeader();
+  print FILE "macros=", abs_path("$utthome/lib/utt/terms.m4"), "\n";
+  print FILE "flex-template=", abs_path("$utthome/lib/utt/ser.l.template"), "\n";
+
+  close FILE;
+}
+
+sub conf_utt() {
+	my $utt_file = shift;
+	my $utthome = shift;
+  open(FILE, ">$utt_file");
+
+  print FILE makeConfigHeader();
+  print FILE "# user locale\n";
+  print FILE "language=", findLocale(), "\n";
+
+  close FILE;
+}
+
+# Szuka locali u uzytkownika
 sub findLocale() {
 	$cur_locale = setlocale(LC_CTYPE);