From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 13 Feb 2006 23:22:18 +0000 (+0000)
Subject: * GNUmakefile.in: remove $(VERSION) symlink.
X-Git-Tag: release/2.7.34~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0a3bf6ccc46e213a24eeee74b6f1722a6f3ffec4;p=lilypond.git

* GNUmakefile.in: remove $(VERSION) symlink.

* lily/relocate.cc (setup_paths): add +
---

diff --git a/ChangeLog b/ChangeLog
index 67b2ebfc96..499698fc73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-14  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+	* GNUmakefile.in: remove $(VERSION) symlink.
+
+
+	* lily/relocate.cc (setup_paths): add + 
+
 2006-02-13  Heikki Junes  <hjunes@cc.hut.fi>
 
 	* Documentation/index.html.in: specify sizes for all big HTML pages.
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 00a3677909..e95d6ba99f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -118,8 +118,6 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile
 	mkdir -p $(tree-bin)
 	mkdir -p $(tree-share-prefix)
 	mkdir -p $(tree-lib-prefix)
-	(cd $(tree-lib)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
-	(cd $(tree-share)/lilypond/ && ln -sf $(TOPLEVEL_VERSION) current)
 	mkdir -p $(tree-share-prefix)/dvips
 	mkdir -p $(tree-share-prefix)/elisp
 	mkdir -p $(tree-share-prefix)/fonts
diff --git a/lily/relocate.cc b/lily/relocate.cc
index 1f30331e0f..cd9b0313ff 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -245,7 +245,7 @@ setup_paths (char const *argv0_ptr)
       if (argv0_prefix != compile_prefix)
 	prefix_relocation (argv0_prefix);
       if (argv0_prefix != compile_prefix || string (FRAMEWORKDIR) != "..")
-	framework_relocation (bindir + "/" FRAMEWORKDIR);
+	framework_relocation (bindir + "/" + FRAMEWORKDIR);
     }
 
   /* FIXME: use LILYPOND_DATADIR.  */