go: makes it build for the case $GOROOT has whitespaces

the bash scripts and makefiles for building go didn't take into account
the fact $GOROOT / $GOBIN could both be directories containing whitespaces,
and was not possible to build it in such a situation.

this commit adjusts the various makefiles/scripts to make it aware of that
possibility, and now it builds successfully when using a path with whitespaces
as well.

Fixes #115.

R=rsc, dsymonds1
https://golang.org/cl/157067

doc/progs/run

@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-. $GOROOT/src/Make.$GOARCH
+. "$GOROOT"/src/Make.$GOARCH
 
 if [ -z "$O" ]; then
 	echo 'missing $O - maybe no Make.$GOARCH?' 1>&2

misc/cgo/gmp/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../src/Make.$(GOARCH)
 
 TARG=gmp
 
@@ -22,7 +22,7 @@ CGO_LDFLAGS=-lgmp
 
 CLEANFILES+=pi fib
 
-include $(GOROOT)/src/Make.pkg
+include ../../../src/Make.pkg
 
 # Simple test programs
 

misc/cgo/stdio/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../src/Make.$(GOARCH)
 
 TARG=stdio
 CGOFILES=\
@@ -10,7 +10,7 @@ CGOFILES=\
 
 CLEANFILES+=hello fib chain run.out
 
-include $(GOROOT)/src/Make.pkg
+include ../../../src/Make.pkg
 
 %: install %.go
 	$(GC) $*.go

src/Make.cmd

@@ -7,6 +7,11 @@ ifndef GOBIN
 GOBIN=$(HOME)/bin
 endif
 
+# ugly hack to deal with whitespaces in $GOBIN
+nullstring :=
+space := $(nullstring) # a space at the end
+QUOTED_GOBIN=$(subst $(space),\ ,$(GOBIN))
+
 all: $(TARG)
 
 $(TARG): _go_.$O $(OFILES)
@@ -15,13 +20,13 @@ $(TARG): _go_.$O $(OFILES)
 _go_.$O: $(GOFILES)
 	$(GC) -o $@ $(GOFILES)
 
-install: $(GOBIN)/$(TARG)
+install: $(QUOTED_GOBIN)/$(TARG)
 
-$(GOBIN)/$(TARG): $(TARG)
+$(QUOTED_GOBIN)/$(TARG): $(TARG)
-	cp $(TARG) $@
+	cp -f $(TARG) $(QUOTED_GOBIN)
 
 clean:
 	rm -f *.[$(OS)] $(TARG) $(CLEANFILES)
 
 nuke:
-	rm -f *.[$(OS)] $(TARG) $(CLEANFILES) $(GOBIN)/$(TARG)
+	rm -f *.[$(OS)] $(TARG) $(CLEANFILES) $(QUOTED_GOBIN)/$(TARG)

src/Make.conf

@@ -4,14 +4,14 @@
 
 CC=quietgcc
 LD=quietgcc
-CFLAGS=-ggdb -I$(GOROOT)/include -O2 -fno-inline
+CFLAGS=-ggdb -I"$(GOROOT)"/include -O2 -fno-inline
 O=o
 YFLAGS=-d
 # GNU Make syntax:
 ifndef GOBIN
-GOBIN=$(HOME)/bin
+GOBIN="$(HOME)/bin"
 endif
 PWD=$(shell pwd)
 
 %.$O: %.c
-	$(CC) $(CFLAGS) -c $(PWD)/$*.c
+	$(CC) $(CFLAGS) -c "$(PWD)"/$*.c

src/Make.pkg

@@ -12,7 +12,13 @@ TARG_words=$(subst /, ,$(TARG))
 elem=$(word $(words $(TARG_words)),$(TARG_words))
 
 dir=$(patsubst %/$(elem),%,./$(TARG))
-pkgdir=$(GOROOT)/pkg/$(GOOS)_$(GOARCH)
+
+# 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)
 
 INSTALLFILES=$(pkgdir)/$(TARG).a
 
@@ -43,8 +49,8 @@ testpackage-clean:
 install: $(INSTALLFILES)
 
 $(pkgdir)/$(TARG).a: package
-	@test -d $(GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir)
+	@test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir)
-	cp _obj/$(TARG).a $@
+	cp _obj/$(TARG).a "$@"
 
 _go_.$O: $(GOFILES) $(PREREQ)
 	$(GC) -o $@ $(GOFILES)
@@ -96,7 +102,7 @@ dir:
 
 # Compile x.cgo3.c with 6c; needs access to the runtime headers.
 RUNTIME_CFLAGS_amd64=-D_64BIT
-RUNTIME_CFLAGS=-I$(GOROOT)/src/pkg/runtime $(RUNTIME_CFLAGS_$(GOARCH))
+RUNTIME_CFLAGS=-I"$(GOROOT)/src/pkg/runtime" $(RUNTIME_CFLAGS_$(GOARCH))
 %.cgo3.$O: %.cgo3.c
 	$(CC) $(CFLAGS) $(RUNTIME_CFLAGS) $*.cgo3.c
 
@@ -116,8 +122,8 @@ $(elem)_%.so: %.cgo4.o
 	gcc $(_CGO_CFLAGS_$(GOARCH)) -o $@ $*.cgo4.o $(CGO_LDFLAGS)  $(_CGO_LDFLAGS_$(GOOS))
 
 $(pkgdir)/$(dir)/$(elem)_%.so: $(elem)_%.so
-	@test -d $(GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir)
+	@test -d $(QUOTED_GOROOT/pkg && mkdir -p $(pkgdir)/$(dir)
-	cp $(elem)_$*.so $@
+	cp $(elem)_$*.so "$@"
 
 # Generic build rules.
 # These come last so that the rules above can override them

src/clean.bash

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-rm -rf $GOROOT/pkg/${GOOS}_$GOARCH
+rm -rf "$GOROOT"/pkg/${GOOS}_$GOARCH
-rm -f $GOROOT/lib/*.a
+rm -f "$GOROOT"/lib/*.a
 for i in lib9 libbio libcgo libmach cmd pkg \
 	../misc/cgo/gmp ../misc/cgo/stdio \
 	../test/bench

src/cmd/5a/Makefile

@@ -21,7 +21,7 @@ YFILES=\
 	a.y\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -37,4 +37,4 @@ clean:
 	rm -f *.$O $(TARG) *.5 enam.c 5.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/5c/Makefile

@@ -29,7 +29,7 @@ LIB=\
 	../cc/cc.a$O
 
 $(TARG): $(OFILES) $(LIB)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) $(LIB) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) $(LIB) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -37,7 +37,7 @@ clean:
 	rm -f *.$O $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 %.$O: ../cc/%.c
 	$(CC) $(CFLAGS) -c -I. -o $@ ../cc/$*.c

src/cmd/5g/Makefile

@@ -27,7 +27,7 @@ LIB=\
 	../gc/gc.a$O
 
 $(TARG): $(OFILES) $(LIB)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) $(LIB) -lbio -l9 -lm
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) $(LIB) -lbio -l9 -lm
 
 $(OFILES): $(HFILES)
 
@@ -35,4 +35,4 @@ clean:
 	rm -f *.o $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/5l/Makefile

@@ -25,7 +25,7 @@ HFILES=\
 	../5l/5.out.h\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -36,7 +36,7 @@ clean:
 	rm -f *.o $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 %.$O: ../ld/%.c
 	$(CC) $(CFLAGS) -c -I. ../ld/$*.c

src/cmd/6a/Makefile

@@ -21,7 +21,7 @@ YFILES=\
 	a.y\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -37,4 +37,4 @@ clean:
 	rm -f *.$O $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/6c/Makefile

@@ -30,7 +30,7 @@ LIB=\
 	../cc/cc.a$O
 
 $(TARG): $(OFILES) $(LIB)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) $(LIB) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) $(LIB) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -38,7 +38,7 @@ clean:
 	rm -f *.$O $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 %.$O: ../cc/%.c
 	$(CC) $(CFLAGS) -c -I. -o $@ ../cc/$*.c

src/cmd/6g/Makefile

@@ -28,7 +28,7 @@ LIB=\
 	../gc/gc.a$O
 
 $(TARG): $(OFILES) $(LIB)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) $(LIB) -lbio -l9 -lm
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) $(LIB) -lbio -l9 -lm
 
 $(OFILES): $(HFILES)
 
@@ -36,4 +36,4 @@ clean:
 	rm -f $(TARG) enam.c 6.out a.out *.$O *.6
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/6l/Makefile

@@ -28,7 +28,7 @@ HFILES=\
 	../ld/macho.h\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -39,7 +39,7 @@ clean:
 	rm -f *.$O $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 %.$O: ../ld/%.c
 	$(CC) $(CFLAGS) -c -I. ../ld/$*.c

src/cmd/8a/Makefile

@@ -21,7 +21,7 @@ YFILES=\
 	a.y\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -37,4 +37,4 @@ clean:
 	rm -f *.$O $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/8c/Makefile

@@ -32,7 +32,7 @@ LIB=\
 	../cc/cc.a$O
 
 $(TARG): $(OFILES) $(LIB)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) $(LIB) -lm -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) $(LIB) -lm -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -40,7 +40,7 @@ clean:
 	rm -f *.$O $(TARG) *.8 8.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 %.$O: ../cc/%.c
 	$(CC) $(CFLAGS) -c -I. -o $@ ../cc/$*.c

src/cmd/8g/Makefile

@@ -29,7 +29,7 @@ LIB=\
 	../gc/gc.a$O
 
 $(TARG): $(OFILES) $(LIB)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) $(LIB) -lbio -l9 -lm
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) $(LIB) -lbio -l9 -lm
 
 $(OFILES): $(HFILES)
 
@@ -37,4 +37,4 @@ clean:
 	rm -f *.$O $(TARG) *.8 enam.c 8.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/8l/Makefile

@@ -28,7 +28,7 @@ HFILES=\
 
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 $(OFILES): $(HFILES)
 
@@ -39,7 +39,7 @@ clean:
 	rm -f *.$O $(TARG) *.8 enam.c 8.out a.out
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 %.$O: ../ld/%.c
 	$(CC) $(CFLAGS) -c -I. ../ld/$*.c

src/cmd/cgo/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=cgo
 GOFILES=\
@@ -12,4 +12,4 @@ GOFILES=\
 	out.go\
 	util.go\
 
-include $(GOROOT)/src/Make.cmd
+include ../../Make.cmd

src/cmd/cov/Makefile

@@ -17,7 +17,7 @@ HFILES=\
 	tree.h\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lmach -lbio -l9
 
 clean:
 	rm -f *.$O $(TARG)
@@ -31,6 +31,6 @@ install-darwin: $(TARG)
 	@true
 
 install-default: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 $(OFILES): $(HFILES)

src/cmd/ebnflint/Makefile

@@ -2,14 +2,14 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=ebnflint
 GOFILES=\
 	ebnflint.go\
 
-include $(GOROOT)/src/Make.cmd
+include ../../Make.cmd
 
 test: $(TARG)
-	$(TARG) -start="SourceFile" $(GOROOT)/doc/go_spec.html
+	$(TARG) -start="SourceFile" "$(GOROOT)"/doc/go_spec.html
 

src/cmd/gc/mkbuiltin

@@ -5,7 +5,7 @@
 
 set -e
 
-. $GOROOT/src/Make.$GOARCH
+. "$GOROOT"/src/Make.$GOARCH
 if [ -z "$GC" ]; then
 	echo 'missing $GC - maybe no Make.$GOARCH?' 1>&2
 	exit 1

src/cmd/godefs/Makefile

@@ -13,12 +13,12 @@ OFILES=\
 HFILES=a.h
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lbio -l9
 
 clean:
 	rm -f *.$O $(TARG)
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 $(OFILES): $(HFILES)

src/cmd/godoc/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=godoc
 GOFILES=\
@@ -12,4 +12,4 @@ GOFILES=\
 	snippet.go\
 	spec.go\
 
-include $(GOROOT)/src/Make.cmd
+include ../../Make.cmd

src/cmd/gofmt/Makefile

@@ -2,18 +2,18 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=gofmt
 GOFILES=\
 	gofmt.go\
 	rewrite.go\
 
-include $(GOROOT)/src/Make.cmd
+include ../../Make.cmd
 
 test: $(TARG)
 	./test.sh
 
 smoketest: $(TARG)
-	./test.sh $(GOROOT)/src/pkg/go/parser/parser.go
+	./test.sh "$(GOROOT)"/src/pkg/go/parser/parser.go
 

src/cmd/gofmt/test.sh

@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-. $GOROOT/src/Make.$GOARCH
+. "$GOROOT"/src/Make.$GOARCH
 if [ -z "$O" ]; then
 	echo 'missing $O - maybe no Make.$GOARCH?' 1>&2
 	exit 1
@@ -28,14 +28,14 @@ count() {
 # apply to one file
 apply1() {
 	#echo $1 $2
-	case `basename $F` in
+	case `basename "$F"` in
 	# the following files are skipped because they are test cases
 	# for syntax errors and thus won't parse in the first place:
 	func3.go | const2.go | \
 	bug014.go | bug050.go |  bug068.go |  bug083.go | bug088.go | \
 	bug106.go | bug121.go | bug125.go | bug133.go | bug160.go | \
 	bug163.go | bug166.go | bug169.go | bug217.go ) ;;
-	* ) $1 $2; count $F;;
+	* ) "$1" "$2"; count "$F";;
 	esac
 }
 
@@ -43,15 +43,15 @@ apply1() {
 # apply to local files
 applydot() {
 	for F in `find . -name "*.go" | grep -v "._"`; do
-		apply1 $1 $F
+		apply1 "$1" $F
 	done
 }
 
 
 # apply to all .go files we can find
 apply() {
-	for F in `find $GOROOT -name "*.go" | grep -v "._"`; do
+	for F in `find "$GOROOT" -name "*.go" | grep -v "._"`; do
-		apply1 $1 $F
+		apply1 "$1" $F
 	done
 }
 
@@ -63,7 +63,7 @@ cleanup() {
 
 silent() {
 	cleanup
-	$CMD $1 > /dev/null 2> $TMP1
+	$CMD "$1" > /dev/null 2> $TMP1
 	if [ $? != 0 ]; then
 		cat $TMP1
 		echo "Error (silent mode test): test.sh $1"
@@ -74,7 +74,7 @@ silent() {
 
 idempotent() {
 	cleanup
-	$CMD $1 > $TMP1
+	$CMD "$1" > $TMP1
 	if [ $? != 0 ]; then
 		echo "Error (step 1 of idempotency test): test.sh $1"
 		exit 1
@@ -103,7 +103,7 @@ idempotent() {
 
 valid() {
 	cleanup
-	$CMD $1 > $TMP1
+	$CMD "$1" > $TMP1
 	if [ $? != 0 ]; then
 		echo "Error (step 1 of validity test): test.sh $1"
 		exit 1
@@ -120,11 +120,11 @@ valid() {
 runtest() {
 	#echo "Testing silent mode"
 	cleanup
-	$1 silent $2
+	"$1" silent "$2"
 
 	#echo "Testing idempotency"
 	cleanup
-	$1 idempotent $2
+	"$1" idempotent "$2"
 }
 
 
@@ -137,15 +137,15 @@ runtests() {
 		cleanup
 		applydot valid
 	else
-		for F in $*; do
+		for F in "$*"; do
-			runtest apply1 $F
+			runtest apply1 "$F"
 		done
 	fi
 }
 
 
 # run over all .go files
-runtests $*
+runtests "$*"
 cleanup
 
 # done

src/cmd/gopack/Makefile

@@ -9,10 +9,10 @@ OFILES=\
 	ar.$O\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lmach -lbio -l9
 
 clean:
 	rm -f *.$O $(TARG)
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/gotest/Makefile

@@ -10,5 +10,5 @@ clean:
 	@true
 
 install: $(TARG)
-	! test -f $(GOBIN)/$(TARG) || chmod u+w $(GOBIN)/$(TARG)
+	! test -f "$(GOBIN)"/$(TARG) || chmod u+w "$(GOBIN)"/$(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)

src/cmd/gotest/gotest

@@ -21,7 +21,7 @@ if [ ! -f [Mm]akefile ]; then
 	exit 2
 fi
 
-. $GOROOT/src/Make.$GOARCH
+. "$GOROOT"/src/Make.$GOARCH
 if [ -z "$O" ]; then
 	echo 'missing $O - maybe no Make.$GOARCH?' 1>&2
 	exit 2

src/cmd/goyacc/Makefile

@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=goyacc
 GOFILES=\
 	goyacc.go\
 
-include $(GOROOT)/src/Make.cmd
+include ../../Make.cmd
 
 units: goyacc units.y
 	./goyacc units.y

src/cmd/hgpatch/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=hgpatch
 GOFILES=\
 	main.go\
 
-include $(GOROOT)/src/Make.cmd
+include ../../Make.cmd

src/cmd/make.bash

@@ -7,7 +7,7 @@ set -e
 
 bash clean.bash
 
-. $GOROOT/src/Make.$GOARCH
+. "$GOROOT"/src/Make.$GOARCH
 if [ -z "$O" ]; then
 	echo 'missing $O - maybe no Make.$GOARCH?' 1>&2
 	exit 1

src/cmd/nm/Makefile

@@ -13,12 +13,12 @@ OFILES=\
 	nm.$O\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lmach -lbio -l9
 
 clean:
 	rm -f *.$O $(TARG)
 
 install: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 $(OFILES): $(HFILES)

src/cmd/prof/Makefile

@@ -17,7 +17,7 @@ OFILES=\
 #	fns.h\
 
 $(TARG): $(OFILES)
-	$(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
+	$(LD) -o $(TARG) -L"$(GOROOT)"/lib $(OFILES) -lmach -lbio -l9
 
 clean:
 	rm -f *.$O $(TARG)
@@ -31,6 +31,6 @@ install-darwin: $(TARG)
 	@true
 
 install-default: $(TARG)
-	cp $(TARG) $(GOBIN)/$(TARG)
+	cp $(TARG) "$(GOBIN)"/$(TARG)
 
 $(OFILES): $(HFILES)

src/lib9/Makefile

@@ -92,11 +92,11 @@ OFILES=\
 	$(UTFOFILES)\
 
 HFILES=\
-	$(GOROOT)/include/u.h\
+	"$(GOROOT)"/include/u.h\
-	$(GOROOT)/include/libc.h\
+	"$(GOROOT)"/include/libc.h\
 
 install: $(LIB)
-	cp $(LIB) $(GOROOT)/lib
+	cp $(LIB) "$(GOROOT)/lib"
 
 $(LIB): $(OFILES)
 	ar rsc $(LIB) $(OFILES)
@@ -111,7 +111,7 @@ clean:
 	rm -f *.$O *.6 6.out $(LIB)
 
 nuke: clean
-	rm -f $(GOROOT)/lib/$(LIB)
+	rm -f "$(GOROOT)"/lib/$(LIB)
 
 #XLIB=$PLAN9/lib/$LIB
 

src/libbio/Makefile

@@ -45,10 +45,10 @@ OFILES=\
 	bwrite.$O\
 
 HFILES=\
-	$(GOROOT)/include/bio.h\
+	../../include/bio.h
 
 install: $(LIB)
-	cp $(LIB) $(GOROOT)/lib
+	cp $(LIB) ../../lib
 
 $(LIB): $(OFILES)
 	ar rsc $(LIB) $(OFILES)
@@ -62,4 +62,4 @@ clean:
 	rm -f $(OFILES) *.6 6.out $(LIB)
 
 nuke: clean
-	rm -f $(GOROOT)/lib/$(LIB)
+	rm -f ../../lib/$(LIB)

src/libcgo/Makefile

@@ -2,9 +2,14 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
+# ugly hack to deal with whitespaces in $GOROOT
+nullstring :=
+space := $(nullstring) # a space at the end
+QUOTED_GOROOT=$(subst $(space),\ ,$(GOROOT))
+
 all: libcgo.so
 
-install: $(GOROOT)/pkg/$(GOOS)_$(GOARCH)/libcgo.so
+install: $(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)/libcgo.so
 
 OFILES=\
 	$(GOOS)_$(GOARCH).o\
@@ -27,8 +32,8 @@ LDFLAGS_freebsd=-pthread -shared -lm
 libcgo.so: $(OFILES)
 	gcc $(CFLAGS_$(GOARCH)) -o libcgo.so $(OFILES) $(LDFLAGS_$(GOOS))
 
-$(GOROOT)/pkg/$(GOOS)_$(GOARCH)/libcgo.so: libcgo.so
+$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)/libcgo.so: libcgo.so
-	cp libcgo.so $@
+	cp libcgo.so $(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)
 
 clean:
 	rm -f *.o *.so

src/libmach/Makefile

@@ -49,10 +49,10 @@ OFILES=\
 	8obj.$O\
 	$(shell uname | tr A-Z a-z).$O\
 
-HFILES=$(GOROOT)/include/mach.h elf.h macho.h obj.h
+HFILES=../../include/mach.h elf.h macho.h obj.h
 
 install: $(LIB)
-	cp $(LIB) $(GOROOT)/lib
+	cp $(LIB) ../../lib
 
 $(LIB): $(OFILES)
 	ar rsc $(LIB) $(OFILES)
@@ -63,5 +63,5 @@ clean:
 	rm -f *.$O $(LIB)
 
 nuke: clean
-	rm -f $(GOROOT)/lib/$(LIB)
+	rm -f "$(GOROOT)"/lib/$(LIB)
 

src/make-arm.bash

@@ -7,7 +7,7 @@ set -e
 GOBIN="${GOBIN:-$HOME/bin}"
 export MAKEFLAGS=-j4
 
-if ! test -f $GOROOT/include/u.h
+if ! test -f "$GOROOT"/include/u.h
 then
 	echo '$GOROOT is not set correctly or not exported' 1>&2
 	exit 1

src/make.bash

@@ -7,13 +7,13 @@ set -e
 GOBIN="${GOBIN:-$HOME/bin}"
 export MAKEFLAGS=-j4
 
-if ! test -f $GOROOT/include/u.h
+if ! test -f "$GOROOT"/include/u.h
 then
 	echo '$GOROOT is not set correctly or not exported' 1>&2
 	exit 1
 fi
 
-if ! test -d $GOBIN
+if ! test -d "$GOBIN"
 then
 	echo '$GOBIN is not a directory or does not exist' 1>&2
 	echo 'create it or set $GOBIN differently' 1>&2
@@ -36,18 +36,18 @@ darwin | linux | nacl | freebsd)
 	exit 1
 esac
 
-rm -f $GOBIN/quietgcc
+rm -f "$GOBIN"/quietgcc
 CC=${CC:-gcc}
-sed -e "s|@CC@|$CC|" < quietgcc.bash > $GOBIN/quietgcc
+sed -e "s|@CC@|$CC|" < quietgcc.bash > "$GOBIN"/quietgcc
-chmod +x $GOBIN/quietgcc
+chmod +x "$GOBIN"/quietgcc
 
-rm -f $GOBIN/gomake
+rm -f "$GOBIN"/gomake
 MAKE=make
 if ! make --version 2>/dev/null | grep 'GNU Make' >/dev/null; then
 	MAKE=gmake
 fi
-(echo '#!/bin/sh'; echo 'exec '$MAKE' "$@"') >$GOBIN/gomake
+(echo '#!/bin/sh'; echo 'exec '$MAKE' "$@"') >"$GOBIN"/gomake
-chmod +x $GOBIN/gomake
+chmod +x "$GOBIN"/gomake
 
 if ! (cd lib9 && which quietgcc) >/dev/null 2>&1; then
 	echo "installed quietgcc as $GOBIN/quietgcc but 'which quietgcc' fails" 1>&2

src/pkg/Makefile

@@ -139,7 +139,7 @@ install: install.dirs
 test:	test.dirs
 
 nuke: nuke.dirs
-	rm -rf $(GOROOT)/pkg/*
+	rm -rf "$(GOROOT)"/pkg/*
 
 deps:
 	./deps.bash

src/pkg/archive/tar/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=archive/tar
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	reader.go\
 	writer.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/asn1/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=asn1
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	common.go\
 	marshal.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/big/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=big
 GOFILES=\
@@ -13,4 +13,4 @@ GOFILES=\
 OFILES=\
 	arith_$(GOARCH).$O\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/bignum/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=bignum
 GOFILES=\
@@ -11,4 +11,4 @@ GOFILES=\
 	integer.go\
 	rational.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/bufio/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=bufio
 GOFILES=\
 	bufio.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/bytes/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=bytes
 GOFILES=\
 	buffer.go\
 	bytes.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/compress/flate/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=compress/flate
 GOFILES=\
@@ -14,4 +14,4 @@ GOFILES=\
 	token.go\
 	util.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/compress/gzip/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=compress/gzip
 GOFILES=\
 	gunzip.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/compress/zlib/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=compress/zlib
 GOFILES=\
 	reader.go\
 	writer.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/container/heap/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=container/heap
 GOFILES=\
 	heap.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/container/list/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=container/list
 GOFILES=\
 	list.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/container/ring/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=container/ring
 GOFILES=\
 	ring.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/container/vector/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=container/vector
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	stringvector.go\
 	vector.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/aes/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/aes
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	cipher.go\
 	const.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/block/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/block
 GOFILES=\
@@ -16,4 +16,4 @@ GOFILES=\
 	ofb.go\
 	xor.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/hmac/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/hmac
 GOFILES=\
 	hmac.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/md5/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/md5
 GOFILES=\
 	md5.go\
 	md5block.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/rc4/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/rc4
 GOFILES=\
 	rc4.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/rsa/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/rsa
 GOFILES=\
 	rsa.go\
 	pkcs1v15.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/sha1/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/sha1
 GOFILES=\
 	sha1.go\
 	sha1block.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/subtle/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/subtle
 GOFILES=\
 	constant_time.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/tls/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/tls
 GOFILES=\
@@ -18,4 +18,4 @@ GOFILES=\
 	ca_set.go\
 	tls.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/crypto/x509/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=crypto/x509
 GOFILES=\
 	x509.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/debug/dwarf/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=debug/dwarf
 GOFILES=\
@@ -13,4 +13,4 @@ GOFILES=\
 	type.go\
 	unit.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/debug/elf/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=debug/elf
 GOFILES=\
 	elf.go\
 	file.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/debug/gosym/Makefile

@@ -2,12 +2,12 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=debug/gosym
 GOFILES=\
 	pclntab.go\
 	symtab.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg
 

src/pkg/debug/macho/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=debug/macho
 GOFILES=\
 	macho.go\
 	file.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/debug/proc/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=debug/proc
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	proc_$(GOOS).go\
 	regs_$(GOOS)_$(GOARCH).go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/ebnf/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=ebnf
 GOFILES=\
 	ebnf.go\
 	parser.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/encoding/ascii85/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=encoding/ascii85
 GOFILES=\
 	ascii85.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/encoding/base64/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=encoding/base64
 GOFILES=\
 	base64.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/encoding/binary/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=encoding/binary
 GOFILES=\
 	binary.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/encoding/git85/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=encoding/git85
 GOFILES=\
 	git.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/encoding/hex/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=encoding/hex
 GOFILES=\
 	hex.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/encoding/pem/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=encoding/pem
 GOFILES=\
 	pem.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/exec/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=exec
 GOFILES=\
 	exec.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/exp/datafmt/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=exp/datafmt
 GOFILES=\
 	datafmt.go\
 	parser.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/exp/draw/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=exp/draw
 GOFILES=\
@@ -11,4 +11,4 @@ GOFILES=\
 	draw.go\
 	event.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/exp/eval/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=exp/eval
 GOFILES=\
@@ -20,4 +20,4 @@ GOFILES=\
 	value.go\
 	world.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/exp/eval/test.bash

@@ -12,13 +12,13 @@ set -e
 make
 6g main.go && 6l main.6
 (
-for i in $(egrep -l '// \$G (\$D/)?\$F\.go \&\& \$L \$F\.\$A && \./\$A\.out' $GOROOT/test/*.go $GOROOT/test/*/*.go)
+for i in $(egrep -l '// \$G (\$D/)?\$F\.go \&\& \$L \$F\.\$A && \./\$A\.out' "$GOROOT"/test/*.go "$GOROOT"/test/*/*.go)
 do
 	if grep '^import' $i >/dev/null 2>&1
 	then
 		true
 	else
-		if $GOROOT/usr/austin/eval/6.out -f $i >/tmp/out 2>&1 && ! test -s /tmp/out
+		if "$GOROOT"/usr/austin/eval/6.out -f $i >/tmp/out 2>&1 && ! test -s /tmp/out
 		then
 			echo PASS $i
 		else

src/pkg/exp/exception/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=exp/exception
 GOFILES=\
 	exception.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/exp/iterable/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=exp/iterable
 GOFILES=\
 	array.go\
 	iterable.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/exp/nacl/av/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../../Make.$(GOARCH)
 
 TARG=exp/nacl/av
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	event.go\
 	image.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../../Make.pkg

src/pkg/exp/nacl/srpc/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../../Make.$(GOARCH)
 
 TARG=exp/nacl/srpc
 GOFILES=\
@@ -10,4 +10,4 @@ GOFILES=\
 	msg.go\
 	server.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../../Make.pkg

src/pkg/exp/ogle/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=exp/ogle
 GOFILES=\
@@ -20,7 +20,7 @@ GOFILES=\
 
 CLEANFILES+=ogle
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg
 
 main.$O: main.go package
 	$(GC) -I_obj $<

src/pkg/expvar/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=expvar
 GOFILES=\
 	expvar.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/flag/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=flag
 GOFILES=\
 	flag.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/fmt/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=fmt
 GOFILES=\
 	format.go\
 	print.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/go/ast/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=go/ast
 GOFILES=\
@@ -11,4 +11,4 @@ GOFILES=\
 	filter.go\
 	walk.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/go/doc/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=go/doc
 GOFILES=\
 	comment.go\
 	doc.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/go/parser/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=go/parser
 GOFILES=\
 	interface.go\
 	parser.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/go/printer/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=go/printer
 GOFILES=\
 	printer.go\
 	nodes.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/go/scanner/Makefile

@@ -2,11 +2,11 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=go/scanner
 GOFILES=\
 	errors.go\
 	scanner.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/go/token/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=go/token
 GOFILES=\
 	token.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/gob/Makefile

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=gob
 GOFILES=\
@@ -12,4 +12,4 @@ GOFILES=\
 	encoder.go\
 	type.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/hash/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../Make.$(GOARCH)
 
 TARG=hash
 GOFILES=\
 	hash.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../Make.pkg

src/pkg/hash/adler32/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=hash/adler32
 GOFILES=\
 	adler32.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg

src/pkg/hash/crc32/Makefile

@@ -2,10 +2,10 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.$(GOARCH)
+include ../../../Make.$(GOARCH)
 
 TARG=hash/crc32
 GOFILES=\
 	crc32.go\
 
-include $(GOROOT)/src/Make.pkg
+include ../../../Make.pkg