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

diff --git a/lily/lily-version.cc b/lily/lily-version.cc
index 6da4880b58..f84730450f 100644
--- a/lily/lily-version.cc
+++ b/lily/lily-version.cc
@@ -1,35 +1,48 @@
 /*
-  lily-version.cc -- implement version strings
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c)  1999--2000 Jan Nieuwenhuizen <janneke@gnu.org>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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;
 }