Index: p/DONE
===================================================================
--- app/DONE	(revision 2fe08ac317129e08d88abab9a195774bbbda43ff)
+++ 	(revision )
@@ -1,7 +1,0 @@
-ZROBIONE:
-* compiledic - plik tymczasowe [PK]
-* lista zaleznosci dla komend system w perlu [PK]
-* poprawic utt_make_conf (wykrywanie slownikow) [PK]
-* Makefile do gph (install).
-* Usuniecie bibliotek (aplhabet, erro).
-* (dla gue i lem) Poprawna obsluga opcji --one-line i oraz --one-field.
Index: app/TODO
===================================================================
--- app/TODO	(revision 40358d23e569b2d0d4697a192451fff347a48e96)
+++ app/TODO	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -1,22 +1,14 @@
 BARDZO WAZNE:
-
-* zawieszanie sie lema dla wyrazow z pola -I (np. kor) [ZROBIONE,TO]
-* komunikaty o nieznalezieniu slownika (lem) [ZROBIONE, TO]
+* przemyslec sposob wybierania jezyka / slownika po zainstalowaniu roznych dystrybucji [PK, TO]
 
 WAZNE:
 * zamienic kota na lepszego (Kubis) [TO]
-* sen - unikać dwukrotnego wstawiania BOSów i EOSów
+* sen - unikac dwukrotnego wstawiania BOSow i EOSow [TO]
 * polaczyc sen'y [TO]
-* programy z atrybutyem input-field: funkcja process_seg zwraca false, gdy nie ma pola podanego po -I [ZROBIONE,TO]
 * generowanie i sprawdzanie zaleznosci dla tarballa [PK]
-* przygotowanie dystrybujcji slownikow [PK]
-* (zrobione dla ser?) Nazwy pmdb2re -> pmdb.tag2re (grp, ser). [ZROBIONE,TO]
 * Zadania zwiazane z rozbudowa ser (src/ser/TODO).
-* Nowa funkcjonalność dla kot? con? - kaÅŒde zdanie w nowym wierszu
+* Nowa funkcjonalnosc dla kot? con? - kazde zdanie w nowym wierszu
 * opcja info w dgp powinna miec domyslna wartosc d lub h
-* podczas tworzenia dystrybucji pojawiaja sie komunikaty:
-find: /home/to/work/utt/lang/dist/tarball/utt-0.9.2/share/utt/pl_PL.UTF-8/.svn: Nie ma takiego pliku ani katalogu
-find: /home/to/work/utt/lang/dist/tarball/utt-0.9.2/share/utt/pl_PL.ISO-8859-2/.svn: Nie ma takiego pliku ani katalogu
-* przyspieszyć process_seg() -> obliczanie prefiksów pól z opcji -s i -S raz na poczatku programu, a nie w kolko
+* przyspieszyc process_seg() -> obliczanie prefiksow pol z opcji -s i -S raz na poczatku programu, a nie w kolko
 * kor: nie dziala opcja distance
 * zunifikowac opcje cor i kor
Index: app/dist/common/prepare_conf.sh
===================================================================
--- app/dist/common/prepare_conf.sh	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
+++ app/dist/common/prepare_conf.sh	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+if test 3 -ne $#
+then
+	echo "Usage: " `basename $0` src_conf_dir dest_conf_dir replacement
+else
+	POLEC="s/PATH_PREFIX/$3/g"
+
+	for FN in `ls $1/*.conf`
+	do
+	    BN=`basename ${FN}`
+	    sed ${POLEC} ${FN} > $2/${BN}
+	done
+fi
Index: app/dist/spec/Makefile
===================================================================
--- app/dist/spec/Makefile	(revision b2647ded51d1c3f8e4a856396ea16c7afd54b9e6)
+++ app/dist/spec/Makefile	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -15,6 +15,9 @@
 	mkdir -p ${_UTT_ROOT}
 	cp -rf ${UTT_DIST_DIR}/* ${_UTT_ROOT}/
-	cp ../common/utt_make_config.pl ${_UTT_ROOT}/bin/
-	chmod 755 ${_UTT_ROOT}/bin/utt_make_config.pl
+	mkdir -p ${_UTT_ROOT}/cnf
+	mv ${_UTT_ROOT}/etc/utt/*.conf ${_UTT_ROOT}/cnf/
+	${DIR}/../common/prepare_conf.sh ${_UTT_ROOT}/cnf ${_UTT_ROOT}/etc/utt \\\/usr\\\/local
+	rm -rf ${_UTT_ROOT}/cnf
+
 	cp ../files/* ${_UTT_ROOT}/
 	cd ${_RPM_FROOT}; rpmbuild -bb ${DIR}/utt.spec
Index: app/dist/spec/README
===================================================================
--- app/dist/spec/README	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/dist/spec/README	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -1,5 +1,5 @@
 This directory contains files necessary to produce rpm package.
 
-First, you must have variable _UTT_DIST_DIR defined properly.
+First, you must have variable UTT_DIST_DIR defined properly.
 This variable should be defined by main Makefile.
 
Index: app/dist/tarball/INSTALL
===================================================================
--- app/dist/tarball/INSTALL	(revision 20b4e44e7537762f6aceb72b039f6e8f8a50e201)
+++ app/dist/tarball/INSTALL	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -1,6 +1,5 @@
 Here you can find some information about how to install utt.
 
-You should just unpack archive and then 
-execute 
-bin/utt_make_config.pl
-
+You should just unpack archive and then execute
+make test
+make install
Index: app/dist/tarball/Makefile
===================================================================
--- app/dist/tarball/Makefile	(revision adb4c8d65ba8b406a1703d1c091bcf1af4bdfb3c)
+++ app/dist/tarball/Makefile	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -36,5 +36,5 @@
 	mkdir -p ${_TARBALL_ROOT}/cnf
 	mv ${_TARBALL_ROOT}/etc/utt/*.conf ${_TARBALL_ROOT}/cnf/
-	${DIR}/prepare_conf.sh ${_TARBALL_ROOT}/cnf ${_TARBALL_ROOT}/etc/utt
+	${DIR}/../common/prepare_conf.sh ${_TARBALL_ROOT}/cnf ${_TARBALL_ROOT}/etc/utt \~\\\/.local
 	rm -rf ${_TARBALL_ROOT}/cnf
 	cp ./INSTALL ${_TARBALL_ROOT}/
Index: p/dist/tarball/prepare_conf.sh
===================================================================
--- app/dist/tarball/prepare_conf.sh	(revision adb4c8d65ba8b406a1703d1c091bcf1af4bdfb3c)
+++ 	(revision )
@@ -1,7 +1,0 @@
-#!/bin/sh
-
-for FN in `ls $1/*.conf`
-do
-    BN=`basename ${FN}`
-    sed 's/PATH_PREFIX/~\/.local/g' ${FN} > $2/${BN}
-done
Index: lang/dist/tarball/Makefile
===================================================================
--- lang/dist/tarball/Makefile	(revision a4d0da553f29bc0fd967ebb3e0e910e46b1f4439)
+++ lang/dist/tarball/Makefile	(revision 9b57c4d68c64c1eecf74b8d771c0471c586fa063)
@@ -33,8 +33,8 @@
 	    cp -fr ${UTT_DIC_BIN}/* ${_TARBALL_ROOT}/${_UTT_DIC_HOME}/; \
 	    cp -fr ${UTT_DIC_CONF_HOME}/* ${_TARBALL_ROOT}/${_UTT_DIC_HOME}/; \
-	    find ${_TARBALL_ROOT}/${_UTT_DIC_HOME} -name .svn -exec rm -rf {} \; ; \
+	    find ${_TARBALL_ROOT}/${_UTT_DIC_HOME} -type d -path '*/.svn' -exec rm -rf {} \; ; \
 	    tar -czf ${UTT_DIC_OUTPUT}/${_TAR_FILE_NAME}.all.tar.gz utt*; \
 	fi
-	
+
 	rm -rf ${_TARBALL_ROOT}