X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fstandalone.scm;h=8fbf6b1f65e7319e28e210b57fea2b0e43df238c;hb=7d45ed56201563544c78f523b27573b0a57b7082;hp=6596a700c09d95258a8c884c0db467ef2b97b1e0;hpb=94189ec2b8da6d7e89dc619c646a927adead9b19;p=lilypond.git

diff --git a/scm/standalone.scm b/scm/standalone.scm
index 6596a700c0..8fbf6b1f65 100644
--- a/scm/standalone.scm
+++ b/scm/standalone.scm
@@ -2,10 +2,13 @@
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
-;;;; (c) 1998--2001 Jan Nieuwenhuizen <janneke@gnu.org>
-;;;; Han-Wen Nienhuys <hanwen@cs.uu.nl>
+;;;; (c) 1998--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+;;;;                 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-(define standalone (not (defined? 'ly-gulp-file)))
+
+(use-modules (ice-9 rdelim))
+
+(define standalone (not (defined? 'ly:gulp-file)))
 ;;(write standalone (current-error-port))
 
 (define (gulp-file name)
@@ -16,8 +19,8 @@
 
 (define (scm-gulp-file name)
   (set! %load-path 
-	(cons (string-append (getenv 'LILYPONDPREFIX) "/ly")
-	      (cons (string-append (getenv 'LILYPONDPREFIX) "/ps")
+	(cons (string-append (getenv "LILYPOND_DATADIR") "/ly")
+	      (cons (string-append (getenv "LILYPOND_DATADIR") "/ps")
 		    %load-path)))
   (let ((path (%search-load-path name)))
        (if path
@@ -31,7 +34,7 @@
 		       (number->string x))
 		   " ")))
 
-(define ly-gulp-file scm-gulp-file)
-(define ly-number->string scm-number->string)
+(define ly:gulp-file scm-gulp-file)
+(define ly:number->string scm-number->string)
 
-(eval-string (ly-gulp-file "lily.scm"))
+(eval-string (ly:gulp-file "lily.scm"))