diff options
| author | Devon H. O'Dell <devon.odell@gmail.com> | 2010-01-06 07:47:56 -0800 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-01-06 07:47:56 -0800 |
| commit | 2eb9171dfb755d86e57dc0496fb6db3c4e072c34 (patch) | |
| tree | 0b745e811154dbe47258db4bf7de3155e096cb7d /src/pkg | |
| parent | 597e57f4d5b6aad29717a41c683e821ad7ee3d8d (diff) | |
| download | go-2eb9171dfb755d86e57dc0496fb6db3c4e072c34.tar.xz | |
Fix missing explicit GOBIN in src/pkg/Makefile. Clean up creation of
QUOTED_GOBIN. Re-take of 181077; fixes copy-pasta that broke build.
Fixes #468
R=rsc
CC=golang-dev
https://golang.org/cl/183125
Diffstat (limited to 'src/pkg')
| -rw-r--r-- | src/pkg/Makefile | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/pkg/Makefile b/src/pkg/Makefile index f37502d58d..0caa0dd3fd 100644 --- a/src/pkg/Makefile +++ b/src/pkg/Makefile @@ -9,6 +9,14 @@ # # to rebuild the dependency information in Make.deps. +nullstring := +space := $(nullstring) # a space at the end +ifndef GOBIN +QUOTED_HOME=$(subst $(space),\ ,$(HOME)) +GOBIN=$(QUOTED_HOME)/bin +endif +QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN)) + all: install DIRS=\ @@ -135,16 +143,16 @@ nuke.dirs: $(addsuffix .nuke, $(DIRS)) test.dirs: $(addsuffix .test, $(TEST)) %.clean: - +cd $* && gomake clean + +cd $* && $(QUOTED_GOBIN)/gomake clean %.install: - +cd $* && gomake install + +cd $* && $(QUOTED_GOBIN)/gomake install %.nuke: - +cd $* && gomake nuke + +cd $* && $(QUOTED_GOBIN)/gomake nuke %.test: - +cd $* && gomake test + +cd $* && $(QUOTED_GOBIN)/gomake test clean: clean.dirs |