From 91a1ab141c47cf362b061d0756e369041786f7dc Mon Sep 17 00:00:00 2001
From: gernot <gernot@4ebea2bb-67d4-0310-8558-a5799e421b66>
Date: Thu, 6 Jan 2005 22:56:20 +0000
Subject: [PATCH] - beautify Hartmut's changes from 2004-12-30 to make script
 code more   understandable after auto-replacement - fix sed statement in
 Makefile

git-svn-id: https://svn.ibp.de/svn/capisuite/trunk/capisuite@389 4ebea2bb-67d4-0310-8558-a5799e421b66
---
 ChangeLog               | 5 +++++
 scripts/Makefile.am     | 2 +-
 scripts/Makefile.in     | 4 ++--
 scripts/cs_helpers.pyin | 3 ++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a94d0db..8e86cea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-06  Gernot Hillier  <gernot@hillier.de>
+	* scripts/cs_helpers.pyin: beautify Hartmut's changes from 2004-12-30
+	  to make script code more understandable after auto-replacement
+	* scripts/Makefile.in: fix sed statement 
+
 2005-01-02  Hartmut Goebel  <h.goebel@crazy-compilers.com>
 	* SConstruct: enhanced for supporting SCons 0.96's 'toolpath'
 	  feature
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 9fb4cfe..227c7e5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -18,7 +18,7 @@ capisuitefax: capisuitefax.in
 
 .pyin.py:
 	rm -f $@
-	sed 's,@sfftobmp_major_version@,$(sfftobmp_major_version),g' $< >$@
+	sed 's,@sfftobmp_major_version\@,$(sfftobmp_major_version),g' $< >$@
 
 .confin.conf: 
 	rm -f $@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index c0baec0..380c720 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -552,12 +552,12 @@ uninstall-info: uninstall-info-recursive
 
 capisuitefax: capisuitefax.in
 	rm -f $@
-	sed -e 's,@\PYTHON@,$(PYTHON),g' $< >$@
+	sed 's,@\PYTHON@,$(PYTHON),g' $< >$@
 	chmod 755 $@
 
 .pyin.py:
 	rm -f $@
-	sed 's,@sfftobmp_major_version@,$(sfftobmp_major_version),g' $< >$@
+	sed 's,@sfftobmp_major_version\@,$(sfftobmp_major_version),g' $< >$@
 
 .confin.conf: 
 	rm -f $@
diff --git a/scripts/cs_helpers.pyin b/scripts/cs_helpers.pyin
index b4df8fc..20459db 100644
--- a/scripts/cs_helpers.pyin
+++ b/scripts/cs_helpers.pyin
@@ -17,7 +17,8 @@ from capisuite.voice import sayNumber, getAudio
 # Convert sff files to tiff files. This is placed in an extra function
 # because the sfftobmp tool used for this conversion has changed its
 # parameters recently.
-if @sfftobmp_major_version@ <= 2:
+sfftobmp_major_version = @sfftobmp_major_version@
+if sfftobmp_major_version <= 2:
     def sff2tif(infile, outfile):
         __call('sff to tif', "sfftobmp", "-tif", infile, outfile)
 else: