* stepmake/stepmake/compile-vars.make:

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

diff --git a/make/generic-vars.make b/make/generic-vars.make
index fcde1cfd52387c938f4135d04933ff37c1fc2fe2..d809ef632e6e6c70100f6a9a2455fb3b77ca8973 100644 (file)
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -8,17 +8,18 @@
 # you do make dist 
 #
 
-# urg, ambiguous and thus error prone; hardcode all $(*scripts) to bin?
-buildscripts = $(depth)/bin
-scripts = $(depth)/bin
+buildscript-dir = $(src-depth)/buildscripts
+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
+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
 
 
 
@@ -29,29 +30,28 @@ LILYPOND_INCLUDES = $(include-lib) $(depth)/lib/$(outdir) $(include-flower) $(de
 
 # 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\
   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/convert-ly\
+  bin/lilypond-book\
   bin/ly2dvi\
-  bin/lilypond$(DOTEXE)\
-  bin/mi2mu$(DOTEXE)\
+  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/lilypond-book.1\
   man/man1/ly2dvi.1\
-  man/man1/convert-mudela.1\
+  man/man1/convert-ly.1\
   lib/texmf/texmf/tex/lilypond\
   lib/texmf/texmf/fonts/source/public/lilypond\
   share/lilypond/\
@@ -60,3 +60,5 @@ INSTALL_DIST_FILES = \
 
 INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES))
 
+
+