-export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH):
-export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
-export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
-export DVIPSHEADERS:=$(builddir)/mf/out::
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(top-build-dir)/buildscripts/$(outconfbase):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
+else
+
+## better not take the binaries from a precompiled bundle, as they
+## rely on env vars for relocation.
+##
+
+#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
+endif
+
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)