* The grand 2005-2006 replace.

[lilypond.git] / lily / lily-version.cc

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 909a9b95a5481dbbde04f2764bb5f28fb084d16e..4cf80766ebe5f731b2791e19c37e514e2cd1be23 100644 (file)
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -3,33 +3,35 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2006 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 ()
+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";
   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;
 }