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

diff --git a/make/generic-vars.make b/make/generic-vars.make
index 3ad2d595d8..c5831d7ec5 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -1,32 +1,28 @@
 # title	   package specific variables
 # file	   make/Variables.make
 #
-# do not change this file for site-wide extensions; please use 
-# make/$(outdir)/Site.make; 
+# do not change this file for site-wide extensions; please use
+# make/$(outdir)/Site.make;
 #
-# Any change in files in this directory (make/) would be distributed, if 
-# you do make dist 
+# Any change in files in this directory (make/) would be distributed, if
+# you do make dist
 #
 
-
-# using src-depth iso depth is only necessary for broken rules that do
-#     cd $(outdir) && foo $(depth) ...
-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
 
-
 flower-dir = $(src-depth)/flower
-lib-dir = $(src-depth)/lib
 lily-dir = $(src-depth)/lily
 mi2mu-dir = $(src-depth)/mi2mu
 make-dir = $(src-depth)/make
-include-lib = $(src-depth)/lib/include
 include-flower = $(src-depth)/flower/include
 
+export PYTHONPATH:=$(auxpython-dir):$(PYTHONPATH)
 
-
-LILYPOND_INCLUDES = $(include-lib) $(depth)/lib/$(outdir) $(include-flower) $(depth)/flower/$(outdir) 
+LILYPOND_INCLUDES = $(include-flower) $(depth)/flower/$(outdir)
 
 
 # should use to create .spec ?
@@ -37,30 +33,11 @@ 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\
-  mutopia\
 
 INSTALLED_EXTRA_DOC_FILES = $(addprefix $(prefix:/%=%)/doc/lilypond/, $(EXTRA_DOC_FILES))
 
-# installed by 'make install'
-INSTALL_DIST_FILES = \
-  bin/convert-mudela\
-  bin/mudela-book\
-  bin/ly2dvi\
-  bin/$(program_prefix)lilypond$(program_suffix)\
-  bin/$(program_prefix)mi2mu$(program-suffix)\
-  info/lilypond.info\
-  man/man1/mi2mu.1\
-  man/man1/lilypond.1\
-  man/man1/mudela-book.1\
-  man/man1/ly2dvi.1\
-  man/man1/convert-mudela.1\
-  lib/texmf/texmf/tex/lilypond\
-  lib/texmf/texmf/fonts/source/public/lilypond\
-  share/lilypond/\
-  share/locale/*/LC_MESSAGES/lilypond.mo\
-
 
 INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES))