X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-version.cc;h=598943c2b3c22c2bcc3bc09d730caaf4211070f3;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=6da4880b58d744d929429f19edf05378ffc72031;hpb=ad7defd5f5a3d0151a711555c2d680c56ef559c7;p=lilypond.git

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 6da4880b58..598943c2b3 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -3,33 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2008 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "config.h"
-#include "version.hh"
 #include "lily-version.hh"
 
-#define VERSION MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL "." MY_PATCH_LEVEL
+#include "config.hh"
+#include "version.hh"
 
-String
-version_str ()
+string
+version_string ()
 {
-  String str = VERSION;
+  string str = MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL;
+  string mpl ("." MY_PATCH_LEVEL);
+  if (mpl != ".")
+    str += mpl;
   return str;
 }
 
-String 
-gnu_lilypond_str ()
+string
+gnu_lilypond_string ()
 {
-  String str = "GNU LilyPond";
+  string str = "GNU LilyPond";
   return str;
 }
 
-String 
-gnu_lilypond_version_str ()
+string
+gnu_lilypond_version_string ()
 {
-  String str = gnu_lilypond_str () + " " + version_str ();
+  string str = gnu_lilypond_string () + " " + version_string ();
   return str;
 }