diff options
| author | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-13 12:44:45 +0000 |
|---|---|---|
| committer | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-13 12:44:45 +0000 |
| commit | 41a57765395585733a2a1faa9032606bc00fd8a0 (patch) | |
| tree | 13dd17cc4fd8c4319cd02b3b068fc4c546a2bb5c /tools | |
| parent | 8a6383884bb3ff25edffe1853deedec6094a8811 (diff) | |
| download | rockbox-41a57765395585733a2a1faa9032606bc00fd8a0.tar.gz rockbox-41a57765395585733a2a1faa9032606bc00fd8a0.tar.bz2 rockbox-41a57765395585733a2a1faa9032606bc00fd8a0.zip | |
Two oops commits for the price of one.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/configure | 2 | ||||
| -rw-r--r-- | tools/voicecommon.sh | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/configure b/tools/configure index 0bbb9584a7..03182cfde4 100755 --- a/tools/configure +++ b/tools/configure @@ -1865,7 +1865,7 @@ if [ "yes" = "$voice" ]; then cat >> Makefile <<EOF voice: tools features - \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ + \$(SILENT)for f in \`cat \$(BUILDDIR)/${apps}/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ for lang in \`echo \$(VOICELANGUAGE) |sed "s/,/ /g"\`; do \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$\$lang \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings-\$\$lang.sh ; done \\ EOF diff --git a/tools/voicecommon.sh b/tools/voicecommon.sh index 052e73b67a..458a7b2ec6 100644 --- a/tools/voicecommon.sh +++ b/tools/voicecommon.sh @@ -128,14 +128,14 @@ init_tts() { case $TTS_ENGINE in festival) # Check for festival_client - if [ -f "`which $FESTIVAL_CLIENT`" ]; then + if [ ! -f "`which $FESTIVAL_CLIENT`" ]; then echo "Error: $FESTIVAL_CLIENT not found" exit 4 fi # Check for, and start festival server if specified if [ X$FESTIVAL_START = XY ]; then - if [ -f "`which $FESTIVAL_BIN`" ]; then + if [ ! -f "`which $FESTIVAL_BIN`" ]; then echo "Error: $FESTIVAL_BIN not found" exit 3 fi @@ -160,14 +160,14 @@ init_tts() { ;; flite) # Check for flite - if [ -f "`which $FLITE_BIN`" ]; then + if [ ! -f "`which $FLITE_BIN`" ]; then echo "Error: $FLITE_BIN not found" exit 5 fi ;; espeak) # Check for espeak - if [ -f "`which $ESPEAK_BIN`" ]; then + if [ ! -f "`which $ESPEAK_BIN`" ]; then echo "Error: $ESPEAK_BIN not found" exit 5 fi @@ -208,21 +208,21 @@ init_encoder() { case $ENCODER in lame) # Check for lame binary - if [ -f "`which $LAME_BIN`" ]; then + if [ ! -f "`which $LAME_BIN`" ]; then echo "Error: $LAME_BIN not found" exit 6 fi ;; speex) # Check for speexenc binary - if [ -f "`which $SPEEX_BIN`" ]; then + if [ ! -f "`which $SPEEX_BIN`" ]; then echo "Error: $SPEEX_BIN not found" exit 7 fi ;; vorbis) # Check for vorbis encoder binary - if [ -f "`which $VORBIS_BIN`" ]; then + if [ ! -f "`which $VORBIS_BIN`" ]; then echo "Error: $VORBIS_BIN not found" exit 10 fi |