X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fgeneric-vars.make;h=c5831d7ec5f42345f3c72e41baf297dce5d988d6;hb=HEAD;hp=428e5b900a939f4441e78c79710bc56ad64f9012;hpb=407be6aca707178dc8dcae673803b16916f59d50;p=lilypond.git

diff --git a/make/generic-vars.make b/make/generic-vars.make
index 428e5b900a..c5831d7ec5 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -8,7 +8,9 @@
 # you do make dist
 #
 
-buildscript-dir = $(src-depth)/buildscripts
+buildscript-dir = $(top-build-dir)/scripts/build/$(outconfbase)
+auxpython-dir = $(src-depth)/python/auxiliar
+auxscript-dir = $(src-depth)/scripts/auxiliar
 script-dir = $(src-depth)/scripts
 input-dir = $(src-depth)/input
 
@@ -18,7 +20,7 @@ mi2mu-dir = $(src-depth)/mi2mu
 make-dir = $(src-depth)/make
 include-flower = $(src-depth)/flower/include
 
-export PYTHONPATH:=$(buildscript-dir):$(PYTHONPATH)
+export PYTHONPATH:=$(auxpython-dir):$(PYTHONPATH)
 
 LILYPOND_INCLUDES = $(include-flower) $(depth)/flower/$(outdir)
 
@@ -31,7 +33,7 @@ EXTRA_DOC_FILES = \
   Documentation/out/*.txt\
   Documentation/tex/*.doc\
   Documentation/tex/*.bib\
-  Documentation/pictures/out/lelie_logo.gif\
+  Documentation/logo/out/lelie_logo.gif\
   input\
 
 INSTALLED_EXTRA_DOC_FILES = $(addprefix $(prefix:/%=%)/doc/lilypond/, $(EXTRA_DOC_FILES))