X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Frelocate.cc;h=47502f7dbda9f054f9524c0587763cf5b26bc91b;hb=49c5e7ba9c44a60281f45a802a77e006570c7ac0;hp=a60b262c5e7bc966bd80d141e5e84e1e231f61a0;hpb=03ce3667568361ee7433032988a4089c64de2ec7;p=lilypond.git

diff --git a/lily/relocate.cc b/lily/relocate.cc
index a60b262c5e..47502f7dbd 100644
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2005--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2005--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
 */
 
@@ -44,7 +44,12 @@ sane_putenv (char const *key, string value, bool overwrite)
 	progress_indication (_f ("Setting %s to %s" , key, value.c_str ())
 			     + "\n");
 			     
-      return putenv (s);
+      int retval =  putenv (s);
+      /*
+	unfortunately, we can't portably free S here,
+	due to various bugs in glibc prior to 2.1.1
+       */ 
+      return retval;
     }
   
   return -1;
@@ -228,11 +233,7 @@ setup_paths (char const *argv0_ptr)
   /*
     When running from build dir, a full LILYPOND_PREFIX is set-up at
 
-        $(OUTBASE)/share/lilypond/TOPLEVEL_VERSION
-
-     This historical hack will allow the shorthand
-
-        LILYPONDPREFIX=out lily/out/lilypond ...
+        $(OUTBASE)/{share,lib}/lilypond/current
 
   */