From 880ee6e7feb33daeb94c6a1195c8eb4202a570b0 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Thu, 17 Jan 2008 00:22:07 +0100
Subject: Fixed some compile time problems with the version generation.

---
 .gitignore             | 1 +
 Makefile               | 1 +
 buildutil/version-util | 6 ++++--
 pages/pageelems.ecpp   | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c990521..020d64b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ CVS
 *.o
 *.a
 *.so
+gen_version_suffix.h
 pages/*.cpp
 po/*.mo
 po/live.pot
diff --git a/Makefile b/Makefile
index 28e8bea..dfe8697 100644
--- a/Makefile
+++ b/Makefile
@@ -182,6 +182,7 @@ dist: clean
 clean: $(SUBDIRS)
 	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
 	@-rm -f $(PLUGINOBJS) $(DEPFILE) *.so *.tgz core* *~
+	@-rm -f $(VERSIONSUFFIX)
 
 .PRECIOUS: $(I18Npo)
 
diff --git a/buildutil/version-util b/buildutil/version-util
index cf2aa31..f35d7f7 100755
--- a/buildutil/version-util
+++ b/buildutil/version-util
@@ -22,7 +22,7 @@ cat <<EOF
  */
 #ifndef GEN_VERSION_SUFFIX_H
 #define GEN_VERSION_SUFFIX_H
-#define VERSION_SUFFIX $1
+#define VERSION_SUFFIX "$1"
 #endif
 EOF
 }
@@ -60,7 +60,9 @@ function checkVers ()
     else
 	v=`grep '^#define VERSION_SUFFIX' ${VERS_FILE} \
 	    | awk '{print $3}'`
-	if [ "$v" != "$s" ]; then
+	echo "s: $s"
+	echo "v: $v"
+	if [ "$v" != "\"$s\"" ]; then
 	    echo "$VERS_FILE is being recreated!"
 	    createVers $s > ${VERS_FILE}
 	fi
diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp
index 34cfbf8..a2fef4a 100644
--- a/pages/pageelems.ecpp
+++ b/pages/pageelems.ecpp
@@ -335,7 +335,7 @@ int update_status(1);
 				<div class="about_right">Michael Brückner (skiller2k1)</div>
 				<div class="about_head"><div><div><$ tr("Information") $></div></div></div>
 				<div class="about_left"><$ tr("LIVE version") $>:</div>
-				<div class="about_right"><$ LIVEVERSION $><$ VERSION_SUFFIX $></div>
+				<div class="about_right"><$ LIVEVERSION $><$ #VERSION_SUFFIX $></div>
 				<div class="about_left"><$ tr("VDR version") $>:</div>
 				<div class="about_right"><$ VDRVERSION $></div>
 				<div class="about_head"><div><div><$ tr("Features") $></div></div></div>
-- 
cgit v1.2.3