release: 1.5.26

[lilypond.git] / make / lilypond-vars.make

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 3395536e9fd390768bd054929f36478fe6fa2198..0eff08a3db61dbda7d1d846b285add7d50168e3a 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -15,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?