patch::: 1.3.104.jcn1

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

diff --git a/make/generic-vars.make b/make/generic-vars.make
index fcde1cfd52387c938f4135d04933ff37c1fc2fe2..3ad2d595d8399f0f38a1c7c8f324d5637f0edae1 100644 (file)
--- a/make/generic-vars.make
+++ b/make/generic-vars.make
@@ -8,17 +8,21 @@
 # you do make dist 
 #
 
-# urg, ambiguous and thus error prone; hardcode all $(*scripts) to bin?
-buildscripts = $(depth)/bin
-scripts = $(depth)/bin
 
-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
+# using src-depth iso depth is only necessary for broken rules that do
+#     cd $(outdir) && foo $(depth) ...
+buildscript-dir = $(src-depth)/buildscripts
+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
 
 
 
@@ -29,7 +33,7 @@ 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\
@@ -44,8 +48,8 @@ INSTALL_DIST_FILES = \
   bin/convert-mudela\
   bin/mudela-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\
@@ -60,3 +64,5 @@ INSTALL_DIST_FILES = \
 
 INSTALLED_DIST_FILES = $(addprefix $(prefix:/%=%)/, $(INSTALL_DIST_FILES))
 
+
+