From 0a94d58a9cc91927f9372fe5253ad80c821dfa13 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 5 Jan 2010 13:51:48 +0100
Subject: [PATCH] Set PATH for make $(shell calls.  Fixes bin/gub's environment
 check failures.

When using make, together with:

   sourcefiles/gub.sh as ~/bin/gub

and the local.make snippet

   ifneq ($(findstring xbin:,x$(PATH)),xbin:)
   PATH := bin:$(HOME)/vc/gub/bin:$(PATH)
   endif

you can simply call "gub" and still use the "make" fontend.
---
 compilers.make | 2 +-
 lilypond.make  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compilers.make b/compilers.make
index 2f7f408cf..b8365c5f4 100644
--- a/compilers.make
+++ b/compilers.make
@@ -32,7 +32,7 @@ DISTCC_DIRS=target/cross-distcc/bin target/cross-distccd/bin target/native-distc
 #gcc_or_glibc = $(shell $(GUB) -p $(1) --inspect=version glibc > /dev/null 2>/dev/null && echo glibc || echo cross/gcc)
 gcc_or_glibc = $(shell if echo $(1) | grep linux > /dev/null 2>/dev/null; then echo glibc; else echo cross/gcc; fi)
 
-tools = $(shell $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::$(call gcc_or_glibc,$(p))) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::')
+tools = $(shell PATH=$(PATH) $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::$(call gcc_or_glibc,$(p))) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::')
 
 compilers: cross-compilers
 
diff --git a/lilypond.make b/lilypond.make
index 4ef8ac56d..8646572ab 100644
--- a/lilypond.make
+++ b/lilypond.make
@@ -178,7 +178,7 @@ realclean:
 ################################################################
 # compilers and tools
 
-tools := $(shell $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::')
+tools := $(shell PATH=$(PATH) $(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::')
 
 ptools:
 	$(GUB) --show-dependencies $(foreach p, $(PLATFORMS), $(p)::lilypond $(p)::lilypond-doc $(p)::lilypond-installer) 2>&1 | grep ^dependencies | tr ' ' '\n' | grep 'tools::'