Mercurial > gub
changeset 5879:c7402f3a77bc
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.
| author | Jan Nieuwenhuizen <janneke@gnu.org> |
|---|---|
| date | Tue, 05 Jan 2010 13:51:48 +0100 |
| parents | 769a4ef2e83e |
| children | 8cd52860b992 1c6993fdde84 5edacd2bdd39 |
| files | compilers.make lilypond.make |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/compilers.make Tue Jan 05 22:33:50 2010 +1100 +++ b/compilers.make Tue Jan 05 13:51:48 2010 +0100 @@ -32,7 +32,7 @@ #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
--- a/lilypond.make Tue Jan 05 22:33:50 2010 +1100 +++ b/lilypond.make Tue Jan 05 13:51:48 2010 +0100 @@ -178,7 +178,7 @@ ################################################################ # 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::'