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

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

diff --git a/ChangeLog b/ChangeLog
index 67b2ebfc968ecc6b2975d367b2f7ca6087c879d1..499698fc73c78cbb3a5711d89f40e41788a24d3c 100644 (file)
--- 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 00a3677909103fc6812b6c5e8358dd7e4cbee88b..e95d6ba99f2bfca2e260ff400a871c495186b93f 100644 (file)
--- 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 1f30331e0f3e03e66f9873f411eeb65a1400b9b6..cd9b0313ff5f35723344baf08b448e40ab3ce2ab 100644 (file)
--- 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.  */