Merge branch 'master' into android

Conflicts:
	README.md

Makefile.am

@@ -105,11 +105,6 @@ src/espeakedit: $(common_SOURCE) $(libespeak_SOURCE) $(espeakedit_SOURCE)
 espeak-phoneme-data:
 	cd platforms/$(PLATFORM) && make PREFIX=$(PREFIX) && cd ../..
 
-espeak-data/dir.stamp:
-	rm -rf $(HOME)/espeak-data
-	ln -sv $(PWD)/espeak-data $(HOME)/espeak-data
-	touch espeak-data/dir.stamp
-
 espeak-data/dictsource/dir.stamp: dictsource/*
 	rm -rf espeak-data/dictsource
 	./shadowdir $(PWD)/dictsource $(PWD)/espeak-data/dictsource
@@ -120,8 +115,8 @@ espeak-data/phsource/dir.stamp: phsource/ph_* phsource/phonemes phsource/intonat
 	./shadowdir $(PWD)/phsource $(PWD)/espeak-data/phsource
 	touch espeak-data/phsource/dir.stamp
 
-espeak-data/phontab: src/espeakedit espeak-data/dir.stamp espeak-data/dictsource/dir.stamp espeak-data/phsource/dir.stamp
-	src/espeakedit --compile
+espeak-data/phontab: src/espeakedit espeak-data/dictsource/dir.stamp espeak-data/phsource/dir.stamp
+	ESPEAK_DATA_PATH=$(PWD) src/espeakedit --compile
 
 ##### android language data packs:
 
@@ -207,370 +202,370 @@ af: espeak-data/af_dict
 dictsource/af_extra:
 	touch dictsource/af_extra
 espeak-data/af_dict: src/espeak espeak-data/phontab dictsource/af_list dictsource/af_rules dictsource/af_extra
-	cd dictsource && ../src/espeak --compile=af && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=af && cd ..
 
 am: espeak-data/am_dict
 dictsource/am_extra:
 	touch dictsource/am_extra
 espeak-data/am_dict: src/espeak espeak-data/phontab dictsource/am_list dictsource/am_rules dictsource/am_extra
-	cd dictsource && ../src/espeak --compile=am && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=am && cd ..
 
 an: espeak-data/an_dict
 dictsource/an_extra:
 	touch dictsource/an_extra
 espeak-data/an_dict: src/espeak espeak-data/phontab dictsource/an_list dictsource/an_rules dictsource/an_extra
-	cd dictsource && ../src/espeak --compile=an && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=an && cd ..
 
 az: espeak-data/az_dict
 dictsource/az_extra:
 	touch dictsource/az_extra
 espeak-data/az_dict: src/espeak espeak-data/phontab dictsource/az_list dictsource/az_rules dictsource/az_extra
-	cd dictsource && ../src/espeak --compile=az && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=az && cd ..
 
 bg: espeak-data/bg_dict
 dictsource/bg_extra:
 	touch dictsource/bg_extra
 espeak-data/bg_dict: src/espeak espeak-data/phontab dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra
-	cd dictsource && ../src/espeak --compile=bg && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=bg && cd ..
 
 bn: espeak-data/bn_dict
 dictsource/bn_extra:
 	touch dictsource/bn_extra
 espeak-data/bn_dict: src/espeak espeak-data/phontab dictsource/bn_list dictsource/bn_rules dictsource/bn_extra
-	cd dictsource && ../src/espeak --compile=bn && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=bn && cd ..
 
 ca: espeak-data/ca_dict
 dictsource/ca_extra:
 	touch dictsource/ca_extra
 espeak-data/ca_dict: src/espeak espeak-data/phontab dictsource/ca_list dictsource/ca_rules dictsource/ca_extra
-	cd dictsource && ../src/espeak --compile=ca && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ca && cd ..
 
 cs: espeak-data/cs_dict
 dictsource/cs_extra:
 	touch dictsource/cs_extra
 espeak-data/cs_dict: src/espeak espeak-data/phontab dictsource/cs_list dictsource/cs_rules dictsource/cs_extra
-	cd dictsource && ../src/espeak --compile=cs && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=cs && cd ..
 
 cy: espeak-data/cy_dict
 dictsource/cy_extra:
 	touch dictsource/cy_extra
 espeak-data/cy_dict: src/espeak espeak-data/phontab dictsource/cy_list dictsource/cy_rules dictsource/cy_extra
-	cd dictsource && ../src/espeak --compile=cy && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=cy && cd ..
 
 da: espeak-data/da_dict
 dictsource/da_extra:
 	touch dictsource/da_extra
 espeak-data/da_dict: src/espeak espeak-data/phontab dictsource/da_list dictsource/da_rules dictsource/da_extra
-	cd dictsource && ../src/espeak --compile=da && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=da && cd ..
 
 de: espeak-data/de_dict
 dictsource/de_extra:
 	touch dictsource/de_extra
 espeak-data/de_dict: src/espeak espeak-data/phontab dictsource/de_list dictsource/de_rules dictsource/de_extra
-	cd dictsource && ../src/espeak --compile=de && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=de && cd ..
 
 el: espeak-data/el_dict
 dictsource/el_extra:
 	touch dictsource/el_extra
 espeak-data/el_dict: src/espeak espeak-data/phontab dictsource/el_list dictsource/el_rules dictsource/el_extra
-	cd dictsource && ../src/espeak --compile=el && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=el && cd ..
 
 en: espeak-data/en_dict
 dictsource/en_extra:
 	touch dictsource/en_extra
 espeak-data/en_dict: src/espeak espeak-data/phontab dictsource/en_list dictsource/en_rules dictsource/en_extra
-	cd dictsource && ../src/espeak --compile=en && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=en && cd ..
 
 eo: espeak-data/eo_dict
 dictsource/eo_extra:
 	touch dictsource/eo_extra
 espeak-data/eo_dict: src/espeak espeak-data/phontab dictsource/eo_list dictsource/eo_rules dictsource/eo_extra
-	cd dictsource && ../src/espeak --compile=eo && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=eo && cd ..
 
 es: espeak-data/es_dict
 dictsource/es_extra:
 	touch dictsource/es_extra
 espeak-data/es_dict: src/espeak espeak-data/phontab dictsource/es_list dictsource/es_rules dictsource/es_extra
-	cd dictsource && ../src/espeak --compile=es && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=es && cd ..
 
 et: espeak-data/et_dict
 dictsource/et_extra:
 	touch dictsource/et_extra
 espeak-data/et_dict: src/espeak espeak-data/phontab dictsource/et_list dictsource/et_rules dictsource/et_extra
-	cd dictsource && ../src/espeak --compile=et && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=et && cd ..
 
 fa: espeak-data/fa_dict
 dictsource/fa_extra:
 	touch dictsource/fa_extra
 espeak-data/fa_dict: src/espeak espeak-data/phontab dictsource/fa_list dictsource/fa_rules dictsource/fa_extra
-	cd dictsource && ../src/espeak --compile=fa && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=fa && cd ..
 
 fi: espeak-data/fi_dict
 dictsource/fi_extra:
 	touch dictsource/fi_extra
 espeak-data/fi_dict: src/espeak espeak-data/phontab dictsource/fi_list dictsource/fi_rules dictsource/fi_extra
-	cd dictsource && ../src/espeak --compile=fi && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=fi && cd ..
 
 fr: espeak-data/fr_dict
 dictsource/fr_extra:
 	touch dictsource/fr_extra
 espeak-data/fr_dict: src/espeak espeak-data/phontab dictsource/fr_list dictsource/fr_rules dictsource/fr_extra
-	cd dictsource && ../src/espeak --compile=fr && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=fr && cd ..
 
 ga: espeak-data/ga_dict
 dictsource/ga_extra:
 	touch dictsource/ga_extra
 espeak-data/ga_dict: src/espeak espeak-data/phontab dictsource/ga_list dictsource/ga_rules dictsource/ga_extra
-	cd dictsource && ../src/espeak --compile=ga && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ga && cd ..
 
 grc: espeak-data/grc_dict
 dictsource/grc_extra:
 	touch dictsource/grc_extra
 espeak-data/grc_dict: src/espeak espeak-data/phontab dictsource/grc_list dictsource/grc_rules dictsource/grc_extra
-	cd dictsource && ../src/espeak --compile=grc && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=grc && cd ..
 
 hi: espeak-data/hi_dict
 dictsource/hi_extra:
 	touch dictsource/hi_extra
 espeak-data/hi_dict: src/espeak espeak-data/phontab dictsource/hi_list dictsource/hi_rules dictsource/hi_extra
-	cd dictsource && ../src/espeak --compile=hi && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=hi && cd ..
 
 hu: espeak-data/hu_dict
 dictsource/hu_extra:
 	touch dictsource/hu_extra
 espeak-data/hu_dict: src/espeak espeak-data/phontab dictsource/hu_list dictsource/hu_rules dictsource/hu_extra
-	cd dictsource && ../src/espeak --compile=hu && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=hu && cd ..
 
 hy: espeak-data/hy_dict
 dictsource/hy_extra:
 	touch dictsource/hy_extra
 espeak-data/hy_dict: src/espeak espeak-data/phontab dictsource/hy_list dictsource/hy_rules dictsource/hy_extra
-	cd dictsource && ../src/espeak --compile=hy && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=hy && cd ..
 
 id: espeak-data/id_dict
 dictsource/id_extra:
 	touch dictsource/id_extra
 espeak-data/id_dict: src/espeak espeak-data/phontab dictsource/id_list dictsource/id_rules dictsource/id_extra
-	cd dictsource && ../src/espeak --compile=id && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=id && cd ..
 
 is: espeak-data/is_dict
 dictsource/is_extra:
 	touch dictsource/is_extra
 espeak-data/is_dict: src/espeak espeak-data/phontab dictsource/is_list dictsource/is_rules dictsource/is_extra
-	cd dictsource && ../src/espeak --compile=is && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=is && cd ..
 
 it: espeak-data/it_dict
 dictsource/it_extra:
 	touch dictsource/it_extra
 espeak-data/it_dict: src/espeak espeak-data/phontab dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra
-	cd dictsource && ../src/espeak --compile=it && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=it && cd ..
 
 jbo: espeak-data/jbo_dict
 dictsource/jbo_extra:
 	touch dictsource/jbo_extra
 espeak-data/jbo_dict: src/espeak espeak-data/phontab dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra
-	cd dictsource && ../src/espeak --compile=jbo && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=jbo && cd ..
 
 ka: espeak-data/ka_dict
 dictsource/ka_extra:
 	touch dictsource/ka_extra
 espeak-data/ka_dict: src/espeak espeak-data/phontab dictsource/ka_list dictsource/ka_rules dictsource/ka_extra
-	cd dictsource && ../src/espeak --compile=ka && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ka && cd ..
 
 kl: espeak-data/kl_dict
 dictsource/kl_extra:
 	touch dictsource/kl_extra
 espeak-data/kl_dict: src/espeak espeak-data/phontab dictsource/kl_list dictsource/kl_rules dictsource/kl_extra
-	cd dictsource && ../src/espeak --compile=kl && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=kl && cd ..
 
 kn: espeak-data/kn_dict
 dictsource/kn_extra:
 	touch dictsource/kn_extra
 espeak-data/kn_dict: src/espeak espeak-data/phontab dictsource/kn_list dictsource/kn_rules dictsource/kn_extra
-	cd dictsource && ../src/espeak --compile=kn && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=kn && cd ..
 
 ko: espeak-data/ko_dict
 dictsource/ko_extra:
 	touch dictsource/ko_extra
 espeak-data/ko_dict: src/espeak espeak-data/phontab dictsource/ko_list dictsource/ko_rules dictsource/ko_extra
-	cd dictsource && ../src/espeak --compile=ko && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ko && cd ..
 
 ku: espeak-data/ku_dict
 dictsource/ku_extra:
 	touch dictsource/ku_extra
 espeak-data/ku_dict: src/espeak espeak-data/phontab dictsource/ku_list dictsource/ku_rules dictsource/ku_extra
-	cd dictsource && ../src/espeak --compile=ku && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ku && cd ..
 
 la: espeak-data/la_dict
 dictsource/la_extra:
 	touch dictsource/la_extra
 espeak-data/la_dict: src/espeak espeak-data/phontab dictsource/la_list dictsource/la_rules dictsource/la_extra
-	cd dictsource && ../src/espeak --compile=la && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=la && cd ..
 
 lt: espeak-data/lt_dict
 dictsource/lt_extra:
 	touch dictsource/lt_extra
 espeak-data/lt_dict: src/espeak espeak-data/phontab dictsource/lt_list dictsource/lt_rules dictsource/lt_extra
-	cd dictsource && ../src/espeak --compile=lt && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=lt && cd ..
 
 lv: espeak-data/lv_dict
 dictsource/lv_extra:
 	touch dictsource/lv_extra
 espeak-data/lv_dict: src/espeak espeak-data/phontab dictsource/lv_list dictsource/lv_rules dictsource/lv_extra
-	cd dictsource && ../src/espeak --compile=lv && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=lv && cd ..
 
 mk: espeak-data/mk_dict
 dictsource/mk_extra:
 	touch dictsource/mk_extra
 espeak-data/mk_dict: src/espeak espeak-data/phontab dictsource/mk_list dictsource/mk_rules dictsource/mk_extra
-	cd dictsource && ../src/espeak --compile=mk && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=mk && cd ..
 
 ml: espeak-data/ml_dict
 dictsource/ml_extra:
 	touch dictsource/ml_extra
 espeak-data/ml_dict: src/espeak espeak-data/phontab dictsource/ml_list dictsource/ml_rules dictsource/ml_extra
-	cd dictsource && ../src/espeak --compile=ml && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ml && cd ..
 
 ms: espeak-data/ms_dict
 dictsource/ms_extra:
 	touch dictsource/ms_extra
 espeak-data/ms_dict: src/espeak espeak-data/phontab dictsource/ms_list dictsource/ms_rules dictsource/ms_extra
-	cd dictsource && ../src/espeak --compile=ms && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ms && cd ..
 
 nci: espeak-data/nci_dict
 dictsource/nci_extra:
 	touch dictsource/nci_extra
 espeak-data/nci_dict: src/espeak espeak-data/phontab dictsource/nci_list dictsource/nci_rules dictsource/nci_extra
-	cd dictsource && ../src/espeak --compile=nci && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=nci && cd ..
 
 ne: espeak-data/ne_dict
 dictsource/ne_extra:
 	touch dictsource/ne_extra
 espeak-data/ne_dict: src/espeak espeak-data/phontab dictsource/ne_list dictsource/ne_rules dictsource/ne_extra
-	cd dictsource && ../src/espeak --compile=ne && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ne && cd ..
 
 nl: espeak-data/nl_dict
 dictsource/nl_extra:
 	touch dictsource/nl_extra
 espeak-data/nl_dict: src/espeak espeak-data/phontab dictsource/nl_list dictsource/nl_rules dictsource/nl_extra
-	cd dictsource && ../src/espeak --compile=nl && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=nl && cd ..
 
 no: espeak-data/no_dict
 dictsource/no_extra:
 	touch dictsource/no_extra
 espeak-data/no_dict: src/espeak espeak-data/phontab dictsource/no_list dictsource/no_rules dictsource/no_extra
-	cd dictsource && ../src/espeak --compile=no && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=no && cd ..
 
 pa: espeak-data/pa_dict
 dictsource/pa_extra:
 	touch dictsource/pa_extra
 espeak-data/pa_dict: src/espeak espeak-data/phontab dictsource/pa_list dictsource/pa_rules dictsource/pa_extra
-	cd dictsource && ../src/espeak --compile=pa && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=pa && cd ..
 
 pap: espeak-data/pap_dict
 dictsource/pap_extra:
 	touch dictsource/pap_extra
 espeak-data/pap_dict: src/espeak espeak-data/phontab dictsource/pap_list dictsource/pap_rules dictsource/pap_extra
-	cd dictsource && ../src/espeak --compile=pap && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=pap && cd ..
 
 pl: espeak-data/pl_dict
 dictsource/pl_extra:
 	touch dictsource/pl_extra
 espeak-data/pl_dict: src/espeak espeak-data/phontab dictsource/pl_list dictsource/pl_rules dictsource/pl_extra
-	cd dictsource && ../src/espeak --compile=pl && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=pl && cd ..
 
 pt: espeak-data/pt_dict
 dictsource/pt_extra:
 	touch dictsource/pt_extra
 espeak-data/pt_dict: src/espeak espeak-data/phontab dictsource/pt_list dictsource/pt_rules dictsource/pt_extra
-	cd dictsource && ../src/espeak --compile=pt && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=pt && cd ..
 
 ro: espeak-data/ro_dict
 dictsource/ro_extra:
 	touch dictsource/ro_extra
 espeak-data/ro_dict: src/espeak espeak-data/phontab dictsource/ro_list dictsource/ro_rules dictsource/ro_extra
-	cd dictsource && ../src/espeak --compile=ro && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ro && cd ..
 
 ru: espeak-data/ru_dict
 dictsource/ru_extra:
 	touch dictsource/ru_extra
 espeak-data/ru_dict: src/espeak espeak-data/phontab dictsource/ru_list dictsource/ru_rules dictsource/ru_extra
-	cd dictsource && ../src/espeak --compile=ru && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ru && cd ..
 
 si: espeak-data/si_dict
 dictsource/si_extra:
 	touch dictsource/si_extra
 espeak-data/si_dict: src/espeak espeak-data/phontab dictsource/si_list dictsource/si_rules dictsource/si_extra
-	cd dictsource && ../src/espeak --compile=si && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=si && cd ..
 
 sk: espeak-data/sk_dict
 dictsource/sk_extra:
 	touch dictsource/sk_extra
 espeak-data/sk_dict: src/espeak espeak-data/phontab dictsource/sk_list dictsource/sk_rules dictsource/sk_extra
-	cd dictsource && ../src/espeak --compile=sk && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=sk && cd ..
 
 sl: espeak-data/sl_dict
 dictsource/sl_extra:
 	touch dictsource/sl_extra
 espeak-data/sl_dict: src/espeak espeak-data/phontab dictsource/sl_list dictsource/sl_rules dictsource/sl_extra
-	cd dictsource && ../src/espeak --compile=sl && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=sl && cd ..
 
 sq: espeak-data/sq_dict
 dictsource/sq_extra:
 	touch dictsource/sq_extra
 espeak-data/sq_dict: src/espeak espeak-data/phontab dictsource/sq_list dictsource/sq_rules dictsource/sq_extra
-	cd dictsource && ../src/espeak --compile=sq && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=sq && cd ..
 
 sv: espeak-data/sv_dict
 dictsource/sv_extra:
 	touch dictsource/sv_extra
 espeak-data/sv_dict: src/espeak espeak-data/phontab dictsource/sv_list dictsource/sv_rules dictsource/sv_extra
-	cd dictsource && ../src/espeak --compile=sv && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=sv && cd ..
 
 sw: espeak-data/sw_dict
 dictsource/sw_extra:
 	touch dictsource/sw_extra
 espeak-data/sw_dict: src/espeak espeak-data/phontab dictsource/sw_list dictsource/sw_rules dictsource/sw_extra
-	cd dictsource && ../src/espeak --compile=sw && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=sw && cd ..
 
 ta: espeak-data/ta_dict
 dictsource/ta_extra:
 	touch dictsource/ta_extra
 espeak-data/ta_dict: src/espeak espeak-data/phontab dictsource/ta_list dictsource/ta_rules dictsource/ta_extra
-	cd dictsource && ../src/espeak --compile=ta && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ta && cd ..
 
 te: espeak-data/te_dict
 dictsource/te_extra:
 	touch dictsource/te_extra
 espeak-data/te_dict: src/espeak espeak-data/phontab dictsource/te_list dictsource/te_rules dictsource/te_extra
-	cd dictsource && ../src/espeak --compile=te && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=te && cd ..
 
 tr: espeak-data/tr_dict
 dictsource/tr_extra:
 	touch dictsource/tr_extra
 espeak-data/tr_dict: src/espeak espeak-data/phontab dictsource/tr_list dictsource/tr_rules dictsource/tr_extra
-	cd dictsource && ../src/espeak --compile=tr && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=tr && cd ..
 
 ur: espeak-data/ur_dict
 dictsource/ur_extra:
 	touch dictsource/ur_extra
 espeak-data/ur_dict: src/espeak espeak-data/phontab dictsource/ur_list dictsource/ur_rules dictsource/ur_extra
-	cd dictsource && ../src/espeak --compile=ur && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=ur && cd ..
 
 vi: espeak-data/vi_dict
 dictsource/vi_extra:
 	touch dictsource/vi_extra
 espeak-data/vi_dict: src/espeak espeak-data/phontab dictsource/vi_list dictsource/vi_rules dictsource/vi_extra
-	cd dictsource && ../src/espeak --compile=vi && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=vi && cd ..
 
 zh: espeak-data/zh_dict
 dictsource/zh_extra:
 	touch dictsource/zh_extra
 espeak-data/zh_dict: src/espeak espeak-data/phontab dictsource/zh_list dictsource/zh_rules dictsource/zh_extra
-	cd dictsource && ../src/espeak --compile=zh && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=zh && cd ..
 
 zhy: espeak-data/zhy_dict
 dictsource/zhy_extra:
 	touch dictsource/zhy_extra
 espeak-data/zhy_dict: src/espeak espeak-data/phontab dictsource/zhy_rules dictsource/zhy_extra
-	cd dictsource && ../src/espeak --compile=zhy && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=zhy && cd ..

mkdictlist

@@ -54,7 +54,7 @@ def write_dictionary_make_rules(f):
 		f.write('dictsource/%s_extra:\n' % name)
 		f.write('\ttouch dictsource/%s_extra\n' % name)
 		f.write('espeak-data/%s_dict: src/espeak espeak-data/phontab %s dictsource/%s_extra\n' % (name, ' '.join(sorted(files)), name))
-		f.write('\tcd dictsource && ../src/espeak --compile=%s && cd ..\n' % name)
+		f.write('\tcd dictsource && ESPEAK_DATA_PATH=$(PWD) ../src/espeak --compile=%s && cd ..\n' % name)
 
 try:
 	filename = sys.argv[1]

src/espeakedit.cpp

@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2005 to 2013 by Jonathan Duddington                     *
  *   email: [email protected]                                    *
+ *   Copyright (C) 2013 by Reece H. Dunn                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -139,7 +140,7 @@ if(argc > 1)
 		exit(0);
 	}
 
-	ConfigInit();
+	ConfigInit(true);
 
 	if(strcmp(param,"--compile")==0)
 	{
@@ -151,7 +152,7 @@ if(argc > 1)
     exit(0);
 }
 
-	ConfigInit();
+	ConfigInit(false);
 	gui_flag = 1;
 	// It seems that the wctype functions don't work until the locale has been set
 	// to something other than the default "C".  Then, not only Latin1 but also the

src/options.cpp

@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2005 to 2013 by Jonathan Duddington                     *
  *   email: [email protected]                                    *
+ *   Copyright (C) 2013 by Reece H. Dunn                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -118,7 +119,7 @@ void ConfigSetPaths()
 }
 
 
-void ConfigInit()
+void ConfigInit(bool use_defaults)
 {//==============
 	wxString string;
 	wxString basedir;
@@ -152,7 +153,10 @@ void ConfigInit()
 		sprintf(path_home,"%s\\espeak-data",path_base);
 	}
 #else
-	snprintf(path_home,sizeof(path_home),"%s/espeak-data",getenv("HOME"));
+        char *env;
+	if((env = getenv("ESPEAK_DATA_PATH")) == NULL)
+		env = getenv("HOME");
+	snprintf(path_home,sizeof(path_home),"%s/espeak-data",env);
 	path_base = path_home;
 #endif
 	mkdir(path_home,S_IRWXU);    // create if it doesn't already exist
@@ -161,6 +165,19 @@ void ConfigInit()
 	wxFileConfig::Set(pConfig);
 
 	basedir = wxString(path_base,wxConvLocal);  // this is only used to set defaults for other paths if they are not in the config file
+	if (use_defaults)
+	{
+		path_spectload = basedir + _T("/phsource");
+		path_spectload2 = basedir + _T("/phsource");
+		path_pitches = basedir + _T("/pitch");
+		path_phsource = basedir + _T("/phsource");
+		path_phfile = path_phsource + _T("/phonemes");
+		path_dictsource = basedir + _T("/dictsource");
+		path_modifiervoice = basedir;
+		path_dir1 = basedir;
+	}
+	else
+	{
 	pConfig->Read(_T("/spectload"),&path_spectload,basedir+_T("/phsource"));
 	pConfig->Read(_T("/spectload2"),&path_spectload2,basedir+_T("/phsource"));
 	pConfig->Read(_T("/pitchpath"),&path_pitches,basedir+_T("/pitch"));
@@ -179,6 +196,7 @@ void ConfigInit()
 	frame_y = pConfig->Read(_T("/windowy"), 0l);
 	frame_h = pConfig->Read(_T("/windowh"), 0l);
 	frame_w = pConfig->Read(_T("/windoww"), 0l);
+	}
 	ConfigSetPaths();
 }  // end of ConfigInit
 

src/options.h

@@ -1,6 +1,7 @@
 /***************************************************************************
  *   Copyright (C) 2005 to 2007 by Jonathan Duddington                     *
  *   email: [email protected]                                    *
+ *   Copyright (C) 2013 by Reece H. Dunn                                   *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -27,7 +28,7 @@
   *@author Jonathan Duddington
   */
 
-extern void ConfigInit();
+extern void ConfigInit(bool use_defaults);
 extern void ConfigSave(int end);
 extern void ConfigSetPaths();