* SConstruct: Further development.

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

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 5dcfcdcac5dd1b68a0923ff2d0558bc86465fb89..6bee35d852cd0baa8c97d71f6c37b7f6285bde2a 100644 (file)
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -3,33 +3,34 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1999--2004 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "config.hh"
 #include "version.hh"
 #include "lily-version.hh"
 
-#define VERSION MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL "." MY_PATCH_LEVEL
-
 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 ()
+gnu_lilypond_string ()
 {
   String str = "GNU LilyPond";
   return str;
 }
 
 String 
-gnu_lilypond_version_str ()
+gnu_lilypond_version_string ()
 {
-  String str = gnu_lilypond_str () + " " + version_str ();
+  String str = gnu_lilypond_string () + " " + version_string ();
   return str;
 }