X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=0eff08a3db61dbda7d1d846b285add7d50168e3a;hb=f57dab636c0caf18cc0ec1c95a3b2bddb61496fd;hp=55162760aafbf91b374b52b41536e7905c0b5674;hpb=e27eb8bc58a6503a5a6099c246331ce36676d1bb;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 55162760aa..0eff08a3db 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,3 +1,6 @@
+##
+## settings to run LilyPond
+
 
 export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
 
@@ -12,8 +15,13 @@ export MT_DESTROOT := $(topdir)/mf/out
 export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
 endif
 
-export LILYPONDPREFIX:=$(depth)/
-export PYTHONPATH:=$(buildscript-dir)/$(outdir):$(PYTHONPATH)
+# don't change to "depth". It makes the GUILE barf.
+#
+# LilyPond is often run from within $(outdir), making a relative
+# PREFIX incorrect.
+export LILYPONDPREFIX:=$(shell cd $(depth)/ ; pwd)
+
+export PYTHONPATH:=$(topdir)/python:$(PYTHONPATH)
 
 # guile load path?