diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-01-17 00:22:07 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-01-17 00:22:07 +0100 |
| commit | 880ee6e7feb33daeb94c6a1195c8eb4202a570b0 (patch) | |
| tree | 41f56853a09b9de5f996fdac3428ce70f527a813 | |
| parent | e565e758763f32f49350b78b63308539cc0d90ab (diff) | |
| download | vdr-plugin-live-880ee6e7feb33daeb94c6a1195c8eb4202a570b0.tar.gz vdr-plugin-live-880ee6e7feb33daeb94c6a1195c8eb4202a570b0.tar.bz2 | |
Fixed some compile time problems with the version generation.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | buildutil/version-util | 6 | ||||
| -rw-r--r-- | pages/pageelems.ecpp | 2 |
4 files changed, 7 insertions, 3 deletions
@@ -4,6 +4,7 @@ CVS *.o *.a *.so +gen_version_suffix.h pages/*.cpp po/*.mo po/live.pot @@ -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> |