* ly/performer-init.ly (VoiceContext): Typos.

* stepmake/stepmake/toplevel-targets.make (install): For srcdir
builds, leave final-install to toplevel srcdir makefile.

* make/srcdir.make.in (install): New target.

diff --git a/ChangeLog b/ChangeLog
index b9d10f35311af406c0673f1fd0a7a91806514c6c..0a60c687f6cfa179b1dd2f69bf33c38e9713510f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-07-25  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * ly/performer-init.ly (VoiceContext): Typos.
+
+       * stepmake/stepmake/toplevel-targets.make (install): For srcdir
+       builds, leave final-install to toplevel srcdir makefile.
+
+       * make/srcdir.make.in (install): New target.
+
 2003-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * ly/performer-init.ly (TabStaffContext, TabVoiceContext): Add.

diff --git a/make/srcdir.make.in b/make/srcdir.make.in
index d4b4f2d5c70b8bbb6336970fe6f2b0cff5c8b561..2263b55866e5e2ca72a89f893bca08a9df027ec3 100644 (file)
--- a/make/srcdir.make.in
+++ b/make/srcdir.make.in
@@ -35,13 +35,17 @@ config = config$(CONFIGSUFFIX).make
 
 include $(config)
 
-SRCDIR=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir)
+export SRCMAKE=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir)
 
 default: all
 
 %:
-       $(SRCDIR) $@
+       $(SRCMAKE) $@
 
 web: 
-       $(SRCDIR) out=www WWW
-       $(SRCDIR) out=www WWW-post
+       $(SRCMAKE) out=www WWW
+       $(SRCMAKE) out=www WWW-post
+
+install:
+       $(SRCMAKE) install
+       $(SRCMAKE) final-install

diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 5847b441cecf9b5b50103c50bd7562ea2291a77d..8aa0c34d04955327393feed847b9218e68858322 100644 (file)
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -118,11 +118,13 @@ local-maintainerclean:
 install-strip:
        $(MAKE) INSTALL="$(INSTALL) -s" install
 
+ifneq ($(strip $(depth)),.)
 final-install:
+       $(LOOP)
 
 install: local-install
        $(LOOP)
-       $(MAKE) final-install
+endif
 
 local-install:
 

diff --git a/stepmake/stepmake/toplevel-targets.make b/stepmake/stepmake/toplevel-targets.make
index e671d3855a917d126668c78c0e3fcb95560a20e1..3ebbeb2c507fc3162d11aea72114ae3a0a776b55 100644 (file)
--- a/stepmake/stepmake/toplevel-targets.make
+++ b/stepmake/stepmake/toplevel-targets.make
@@ -36,6 +36,12 @@ $(README_TXT_FILES): do-top-doc
 
 local-clean:
 
+install:
+       $(LOOP)
+ifeq ($(strip $(SRCMAKE)),)
+       $(MAKE) final-install
+endif
+
 local-dist: do-top-doc
 
 dist:
@@ -75,3 +81,4 @@ Some of these top level targets (diff, dist, release) can be issued\n\
 from anywhere in the source tree.\n\
 "\
 #
+