From cf4a98db1b2d2f25914b8c3c826f13e8edd3885b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 9 Feb 2006 15:18:37 +0000 Subject: [PATCH] * 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. --- ChangeLog | 3 +++ lily/relocate.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9ae9bcf632..7ebcbf1317 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-02-09 Han-Wen Nienhuys + * 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 fb3c89951b..9972db3fb9 100644 --- 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; -- 2.39.2