patch::: 1.5.22.jcn4

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

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 5dcfcdcac5dd1b68a0923ff2d0558bc86465fb89..40220a5532f2f8b42498d1575a7a277e785d0067 100644 (file)
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -3,19 +3,20 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1999--2001 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
-#include "config.hh"
+#include "config.h"
 #include "version.hh"
 #include "lily-version.hh"
 
-#define VERSION MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL "." MY_PATCH_LEVEL
-
 String
 version_str ()
 {
-  String str = VERSION;
+  String str (MAJOR_VERSION "." MINOR_VERSION "."  PATCH_LEVEL);
+  String mpl ("." MY_PATCH_LEVEL);
+  if (mpl != ".")
+    str += mpl;
   return str;
 }