From 12054a7efeced285d02427837f8938ce536eb2ab Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 28 Sep 2013 16:25:56 +0000 Subject: [PATCH 1/2] autogen.sh: don't generate an error if README exists --- autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autogen.sh b/autogen.sh index f14504cc..3ff20a02 100755 --- a/autogen.sh +++ b/autogen.sh @@ -3,7 +3,7 @@ mkdir -p m4 touch AUTHORS touch NEWS -ln -sv README.md README +ln -svf README.md README aclocal -I m4 || exit 1 From 3dbe2492fec9c801bf3c11968a73d7ba1d13ac48 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sat, 12 Oct 2013 16:53:34 +0100 Subject: [PATCH 2/2] mkdictlist: fix mapping/detection of the hbs dictionary (for 'bs' and 'hr') --- Makefile.am | 7 +++++++ mkdictlist | 2 ++ 2 files changed, 9 insertions(+) diff --git a/Makefile.am b/Makefile.am index e4d287b2..518b2aeb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -198,6 +198,7 @@ dictionaries: \ espeak-data/ga_dict \ espeak-data/grc_dict \ espeak-data/gu_dict \ + espeak-data/hbs_dict \ espeak-data/hi_dict \ espeak-data/hu_dict \ espeak-data/hy_dict \ @@ -379,6 +380,12 @@ dictsource/gu_extra: espeak-data/gu_dict: src/espeak espeak-data/phontab dictsource/gu_list dictsource/gu_rules dictsource/gu_extra cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=gu && cd .. +hbs: espeak-data/hbs_dict +dictsource/hbs_extra: + touch dictsource/hbs_extra +espeak-data/hbs_dict: src/espeak espeak-data/phontab dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra + cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=hbs && cd .. + hi: espeak-data/hi_dict dictsource/hi_extra: touch dictsource/hi_extra diff --git a/mkdictlist b/mkdictlist index a7073e94..bba4df03 100755 --- a/mkdictlist +++ b/mkdictlist @@ -13,6 +13,8 @@ dictionaries = {} # Map voice names to dictionaries when these do not match. special_voices = { + 'bs': 'hbs', + 'hr': 'hbs', 'zh-yue': 'zhy', }