From cae555157e63ad45d4b5b57f7bf28179a2642b4c Mon Sep 17 00:00:00 2001
From: janneke <janneke>
Date: Thu, 24 Jul 2003 22:13:57 +0000
Subject: [PATCH] * 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.
---
 ChangeLog                               |  9 +++++++++
 make/srcdir.make.in                     | 12 ++++++++----
 stepmake/stepmake/generic-targets.make  |  4 +++-
 stepmake/stepmake/toplevel-targets.make |  7 +++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9d10f3531..0a60c687f6 100644
--- 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 d4b4f2d5c7..2263b55866 100644
--- 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 5847b441ce..8aa0c34d04 100644
--- 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 e671d3855a..3ebbeb2c50 100644
--- 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\
 "\
 #
+
-- 
2.39.5