* lily/relocate.cc (prefix_relocation): oops. One TOPLEVEL_VERSION

too many.

* lily/relocate.cc (prefix_relocation): allow "current"
iso. TOPLEVEL_VERSION for share/lilypond/ suffix. This makes
changing VERSION in a lily tree less painful.

diff --git a/ChangeLog b/ChangeLog
index 9ae9bcf632e5a94bb2b53875bbd59322721ffa15..7ebcbf13172e807b63462d39ec1caafb8ea8767b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-02-09  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/relocate.cc (prefix_relocation): oops. One TOPLEVEL_VERSION
+       too many.
+
        * Documentation/user/changing-defaults.itely (Difficult tweaks):
        remove applyOutput example.
        (Objects connected to the input): document \tweak, \parenthesize

diff --git a/lily/relocate.cc b/lily/relocate.cc
index fb3c89951b676e1210854911d57db9dac128a681..9972db3fb984353ef4865044543d02e102bf3b1d 100644 (file)
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -106,7 +106,7 @@ prefix_relocation (std::string prefix)
   std::string bindir = prefix + "/bin";
   std::string datadir = prefix + "/share";
   std::string localedir = datadir + "/locale";
-  std::string lilypond_datadir = datadir + "/lilypond/" TOPLEVEL_VERSION;
+  std::string lilypond_datadir = datadir + "/lilypond/";
 
   if (is_dir (lilypond_datadir + "/" + TOPLEVEL_VERSION))
     prefix_directory = lilypond_datadir + "/" + TOPLEVEL_VERSION;