rollback of https://golang.org/cl/181077
(broke build)
TBR=dho
https://golang.org/cl/181139
diff --git a/src/Make.conf b/src/Make.conf
index fa7177a..a90ed0d 100644
--- a/src/Make.conf
+++ b/src/Make.conf
@@ -6,13 +6,17 @@
O=o
YFLAGS=-d
# GNU Make syntax:
+ifndef GOBIN
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))
+else
+nullstring :=
+space := $(nullstring) # a space at the end
+QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN))
+endif
CC=$(QUOTED_GOBIN)/quietgcc
LD=$(QUOTED_GOBIN)/quietgcc
diff --git a/src/Make.pkg b/src/Make.pkg
index d4196b6..b315b2e 100644
--- a/src/Make.pkg
+++ b/src/Make.pkg
@@ -6,13 +6,17 @@
package: _obj/$(TARG).a
testpackage: _test/$(TARG).a
+ifndef GOBIN
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))
+else
+nullstring :=
+space := $(nullstring) # a space at the end
+QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN))
+endif
# GNU Make 3.80 has a bug in lastword
# elem=$(lastword $(subst /, ,$(TARG)))
@@ -26,6 +30,8 @@
endif
# ugly hack to deal with whitespaces in $GOROOT
+nullstring :=
+space := $(nullstring) # a space at the end
QUOTED_GOROOT=$(subst $(space),\ ,$(GOROOT))
pkgdir=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
index 7d1e80d..f37502d 100644
--- a/src/pkg/Makefile
+++ b/src/pkg/Makefile
@@ -9,14 +9,6 @@
#
# to rebuild the dependency information in Make.deps.
-nullstring :=
-space := $(nullstring)
-ifndef GOBIN
-QUOTED_HOME=$(subst $(space),\ ,$(HOME))
-GOBIN=$(QUOTED_HOME)/bin
-endif
-QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN))
-
all: install
DIRS=\
@@ -143,16 +135,16 @@
test.dirs: $(addsuffix .test, $(TEST))
%.clean:
- +cd $* && $(QUOTED_GOBIN)/gomake clean
+ +cd $* && gomake clean
%.install:
- +cd $* && $(QUOTED_GOBIN)/gomake install
+ +cd $* && gomake install
%.nuke:
- +cd $* && $(QUOTED_GOBIN)/gomake nuke
+ +cd $* && gomake nuke
%.test:
- +cd $* && $(QUOTED_GOBIN)/gomake test
+ +cd $* && gomake test
clean: clean.dirs
