release: 0.1.25

[lilypond.git] / make / Variables.make

diff --git a/make/Variables.make b/make/Variables.make
index b601cbd8a45afdafcda3a59979463583f4869d01..37b1127741ff4abc5b30268af361771cdfbc5ece 100644 (file)
--- a/make/Variables.make
+++ b/make/Variables.make
@@ -35,7 +35,7 @@ outdir=$(OUTDIR_NAME)
 
 # derived names
 lily_bindir = $(depth)/bin
-distdir = $(depth)/$(DIST_NAME)
+distdir = $(depth)/$(outdir)/$(DIST_NAME)
 module-distdir = $(depth)/$(MODULE_DIST_NAME)
 depdir = $(outdir)
 
@@ -157,9 +157,6 @@ RANLIB_COMMAND=$(RANLIB) $@
 
 DO_CXX_COMPILE=$(DODEP)\
        $(CXX) -c $(CXXFLAGS) $(CXX_OUTPUT_OPTION) 
-# "CC = $(CC)"
-# "CXX = $(CXX)"
-#
 
 # linker:
 #
@@ -203,11 +200,6 @@ STRIPDEBUG=true
 DISTFILES=$(EXTRA_DISTFILES) Makefile $(ALL_SOURCES)
 DOCDIR=$(depth)/$(outdir)
 
-# .hh should be first. Don't know why
-# take some trouble to auto ignore sources and obsolete stuff.
-progdocs=$(shell $(FIND) ./ -name '*.hh' |egrep -v '$(OUTDIR_NAME)') $(shell $(FIND) ./ -name '*.cc'|egrep -v '$(OUTDIR_NAME)')
-
-
 pod2html=pod2html
 pod2groff=pod2man --center="LilyPond documentation" --section="0"\
        --release="LilyPond $(TOPLEVEL_MAJOR_VERSION).$(TOPLEVEL_MINOR_VERSION).$(TOPLEVEL_PATCH_LEVEL)" $< > $@
@@ -221,3 +213,4 @@ endif
 # substitute $(STRIP) in Site.make if you want stripping
 DO_STRIP=true
 
+