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

diff --git a/make/generic-vars.make b/make/generic-vars.make
index fcde1cfd52..c5831d7ec5 100644
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -1,62 +1,45 @@
 # 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
 #
 
-# urg, ambiguous and thus error prone; hardcode all $(*scripts) to bin?
-buildscripts = $(depth)/bin
-scripts = $(depth)/bin
+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 = $(depth)/flower
-lib-dir = $(depth)/lib
-lily-dir = $(depth)/lily
-mi2mu-dir = $(depth)/mi2mu
-make-dir = $(depth)/make
-include-lib = $(depth)/lib/include
-include-flower = $(depth)/flower/include
+flower-dir = $(src-depth)/flower
+lily-dir = $(src-depth)/lily
+mi2mu-dir = $(src-depth)/mi2mu
+make-dir = $(src-depth)/make
+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 ?
 
 # installed by 'make installextradoc'
 EXTRA_DOC_FILES = \
-  ANNOUNCEMENT ANNOUNCE-0.1 AUTHORS.txt BUGS COPYING DEDICATION INSTALL.txt NEWS PATCHES.txt README.txt TODO \
+  ANNOUNCEMENT ANNOUNCE-0.1 AUTHORS.txt  COPYING DEDICATION INSTALL.txt NEWS PATCHES.txt README.txt TODO \
   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/lilypond$(DOTEXE)\
-  bin/mi2mu$(DOTEXE)\
-  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))
 
+
+