Support use of $GOBINDIR to override $HOME/bin

R=r,gri,rsc
APPROVED=rsc
DELTA=53  (12 added, 6 deleted, 35 changed)
OCL=31822
CL=32282

diff --git a/src/Make.conf b/src/Make.conf
index 29f352079e7dd6ed79a1f8b691d9ffcf3d9eb105..417e49b1366825b7920359dc47e95a72fd386948 100644 (file)
--- a/src/Make.conf
+++ b/src/Make.conf
@@ -5,6 +5,9 @@
 CC=quietgcc
 LD=quietgcc
 CFLAGS=-ggdb -I$(GOROOT)/include -O1
-BIN=$(HOME)/bin
 O=o
 YFLAGS=-d
+# GNU Make syntax:
+ifndef GOBIN
+GOBIN=$(HOME)/bin
+endif

diff --git a/src/cmd/5a/Makefile b/src/cmd/5a/Makefile
index d9e91a03a6de189f8f4c737dac337830d26da6b3..6508d94115b6c3d05940ae33fc49bb75612d00ad 100644 (file)
--- a/src/cmd/5a/Makefile
+++ b/src/cmd/5a/Makefile
@@ -39,4 +39,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/5c/Makefile b/src/cmd/5c/Makefile
index 06dfa4f3e3077405106643e2d6939dbc1db1ac0b..96219bdbaf3f4e14e0e655db3750f7d9ea3829d8 100644 (file)
--- a/src/cmd/5c/Makefile
+++ b/src/cmd/5c/Makefile
@@ -37,8 +37,7 @@ clean:
        rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 %.$O: ../cc/%.c
        $(CC) $(CFLAGS) -c -I. -o $@ ../cc/$*.c
-

diff --git a/src/cmd/5g/Makefile b/src/cmd/5g/Makefile
index b955f20ee48902d16e8fa82e8b9408674454d62a..736d7c10cc08cff7be30a8db4cc5e8d2983757c7 100644 (file)
--- a/src/cmd/5g/Makefile
+++ b/src/cmd/5g/Makefile
@@ -34,4 +34,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/5l/Makefile b/src/cmd/5l/Makefile
index 490f723030467e8f964f658b53402beceb94934a..d2c2f76e1edcab072f7ada874d0d66e1d7c4bb10 100644 (file)
--- a/src/cmd/5l/Makefile
+++ b/src/cmd/5l/Makefile
@@ -37,4 +37,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6a/Makefile b/src/cmd/6a/Makefile
index 73baf7ffd1e7043a00812b769655b26a4a85e301..38548c05f07a0ba68fc2ef620b375269c017d9fe 100644 (file)
--- a/src/cmd/6a/Makefile
+++ b/src/cmd/6a/Makefile
@@ -11,12 +11,10 @@ HFILES=\
        a.h\
        y.tab.h\
        ../6l/6.out.h\
-       compat.h\
 
 OFILES=\
        y.tab.$O\
        lex.$O\
-       compat.$O\
        ../6l/enam.$O\
 
 YFILES=\
@@ -39,4 +37,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6c/Makefile b/src/cmd/6c/Makefile
index b6c8d61d8f680c98f60e52bb729da165b9c8fb89..d5daa9e1b47eb2b64a163b432820efd217c14ad5 100644 (file)
--- a/src/cmd/6c/Makefile
+++ b/src/cmd/6c/Makefile
@@ -38,8 +38,7 @@ clean:
        rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 %.$O: ../cc/%.c
        $(CC) $(CFLAGS) -c -I. -o $@ ../cc/$*.c
-

diff --git a/src/cmd/6g/Makefile b/src/cmd/6g/Makefile
index d4bb7c4b451bdcac19a3b129477c879d5154bd17..2a1819618e23c2120777d5388f81bc36a3823250 100644 (file)
--- a/src/cmd/6g/Makefile
+++ b/src/cmd/6g/Makefile
@@ -36,4 +36,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6l/Makefile b/src/cmd/6l/Makefile
index bcbdb3de7d47507e32f28ae4a8f0fe1dff0a1b07..1044611b76497ccd66b38b3451138a3e6648057a 100644 (file)
--- a/src/cmd/6l/Makefile
+++ b/src/cmd/6l/Makefile
@@ -23,6 +23,7 @@ HFILES=\
        l.h\
        ../6l/6.out.h\
        ../ld/elf64.h\
+       ../6l/compat.h\
 
 
 $(TARG): $(OFILES)
@@ -37,7 +38,7 @@ clean:
        rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 go.o: ../ld/go.c
 

diff --git a/src/cmd/8a/Makefile b/src/cmd/8a/Makefile
index 690c6251de8e27b3caeacb8b830cfd87c377d24d..ae221632b4ec2d72e5744f864d1f077bd41aa472 100644 (file)
--- a/src/cmd/8a/Makefile
+++ b/src/cmd/8a/Makefile
@@ -39,4 +39,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/8c/Makefile b/src/cmd/8c/Makefile
index 0b3736b278dbca51a55daec0c8bfbeb0426195cc..5d8d79fe33e6c0ca9714e77a879c3744e3c6af02 100644 (file)
--- a/src/cmd/8c/Makefile
+++ b/src/cmd/8c/Makefile
@@ -40,8 +40,7 @@ clean:
        rm -f $(OFILES) $(TARG) *.8 8.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 %.$O: ../cc/%.c
        $(CC) $(CFLAGS) -c -I. -o $@ ../cc/$*.c
-

diff --git a/src/cmd/8g/Makefile b/src/cmd/8g/Makefile
index 02ddfa6dd0cb83a36ccd444b088b323792aa7e2a..7325d62d9c89d14131c724f86d290382678f11de 100644 (file)
--- a/src/cmd/8g/Makefile
+++ b/src/cmd/8g/Makefile
@@ -37,4 +37,4 @@ clean:
        rm -f $(OFILES) $(TARG) *.8 enam.c 8.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/8l/Makefile b/src/cmd/8l/Makefile
index 6b8c73ae2e57d064072a7ebf4b491921a5319bef..27004bb83dddda8352b3007ce30f147bfb953456 100644 (file)
--- a/src/cmd/8l/Makefile
+++ b/src/cmd/8l/Makefile
@@ -35,7 +35,6 @@ clean:
        rm -f $(OFILES) $(TARG) *.8 enam.c 8.out a.out
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 go.o: ../ld/go.c
-

diff --git a/src/cmd/ar/Makefile b/src/cmd/ar/Makefile
index 01e97ea63732b260c2012917fa3fe0cea3be675e..b6999aa37a458d494b55503005cedf46ab468f12 100644 (file)
--- a/src/cmd/ar/Makefile
+++ b/src/cmd/ar/Makefile
@@ -19,4 +19,4 @@ clean:
        rm -f $(OFILES) $(TARG)
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/cov/Makefile b/src/cmd/cov/Makefile
index 6f5173075b63beede1555c2cad7a428f4b398b04..fc98974731b3c77be6ab64099164bb485edb3914 100644 (file)
--- a/src/cmd/cov/Makefile
+++ b/src/cmd/cov/Makefile
@@ -30,6 +30,6 @@ install-darwin: $(TARG)
        @true
 
 install-default: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 $(OFILES): $(HFILES)

diff --git a/src/cmd/ebnflint/Makefile b/src/cmd/ebnflint/Makefile
index e2230029864726a0dee0ad936d99b9c99becd444..e473b5c29ee60927ba26451331f24373f5903fde 100644 (file)
--- a/src/cmd/ebnflint/Makefile
+++ b/src/cmd/ebnflint/Makefile
@@ -2,6 +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.conf
 include $(GOROOT)/src/Make.$(GOARCH)
 
 TARG=ebnflint
@@ -18,7 +19,7 @@ clean:
        rm -f $(OFILES) $(TARG)
 
 install: $(TARG)
-       cp $(TARG) $(HOME)/bin/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 %.$O:  %.go
        $(GC) $<

diff --git a/src/cmd/gobuild/Makefile b/src/cmd/gobuild/Makefile
index cb326c24f7658f8c9b4ca81412f6d6b1847e09c1..c0dd9f3f2a4ef167757619232db0c3fdb9e5bbf8 100644 (file)
--- a/src/cmd/gobuild/Makefile
+++ b/src/cmd/gobuild/Makefile
@@ -4,6 +4,8 @@
 
 # ironically, not auto-generated
 
+include ../../Make.conf
+
 O_arm=5
 O_amd64=6
 O_386=8
@@ -71,8 +73,7 @@ gobuild: zzgobuild
 main.$O: phases
 
 nuke: clean
-       rm -f $(HOME)/bin/gobuild
+       rm -f $(GOBIN)/gobuild
 
 install: zzgobuild
-       cp gobuild $(HOME)/bin/gobuild
-
+       cp gobuild $(GOBIN)/gobuild

diff --git a/src/cmd/godefs/Makefile b/src/cmd/godefs/Makefile
index 0d02769c90450f49c34db3fd9bfdcb3f58c58fd9..819f94a004555127eca489b0a72fa932c693ba5a 100644 (file)
--- a/src/cmd/godefs/Makefile
+++ b/src/cmd/godefs/Makefile
@@ -19,6 +19,6 @@ clean:
        rm -f $(OFILES) $(TARG)
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 $(OFILES): $(HFILES)

diff --git a/src/cmd/godoc/Makefile b/src/cmd/godoc/Makefile
index 8365f9feac714ef2f127ce86985704d4a217f82c..53f694e7b99f4d4c36f99eb377ae771614eadcc6 100644 (file)
--- a/src/cmd/godoc/Makefile
+++ b/src/cmd/godoc/Makefile
@@ -2,6 +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.conf
 include $(GOROOT)/src/Make.$(GOARCH)
 
 TARG=godoc
@@ -15,7 +16,7 @@ clean:
        rm -f $(OFILES) $(TARG)
 
 install: $(TARG)
-       cp $(TARG) $(HOME)/bin/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 %.$O:  %.go
        $(GC) $<

diff --git a/src/cmd/gofmt/Makefile b/src/cmd/gofmt/Makefile
index 1312cb19d565ee090201d3d13afc2d41fcaf7d48..01d772ff72d07a7875c3dfe173f95957d589deed 100644 (file)
--- a/src/cmd/gofmt/Makefile
+++ b/src/cmd/gofmt/Makefile
@@ -2,6 +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.conf
 include $(GOROOT)/src/Make.$(GOARCH)
 
 TARG=gofmt
@@ -21,7 +22,7 @@ clean:
        rm -f $(OFILES) $(TARG)
 
 install: $(TARG)
-       cp $(TARG) $(HOME)/bin/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 %.$O:  %.go
        $(GC) $<

diff --git a/src/cmd/gotest/Makefile b/src/cmd/gotest/Makefile
index dbfa3211459ce9de4816488c2a3c37691a8f52bf..8a1f023867742dc0976e32cda5be39a30673568f 100644 (file)
--- a/src/cmd/gotest/Makefile
+++ b/src/cmd/gotest/Makefile
@@ -10,5 +10,5 @@ clean:
        @true
 
 install: $(TARG)
-       ! test -f $(BIN)/$(TARG) || chmod u+w $(BIN)/$(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       ! test -f $(GOBIN)/$(TARG) || chmod u+w $(GOBIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/nm/Makefile b/src/cmd/nm/Makefile
index 080d668c9a1108f8c57a1776626331295e353f79..8ed55ff3fe0013f33dda01f0bb550aa6745eb545 100644 (file)
--- a/src/cmd/nm/Makefile
+++ b/src/cmd/nm/Makefile
@@ -19,6 +19,6 @@ clean:
        rm -f $(OFILES) $(TARG)
 
 install: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 $(OFILES): $(HFILES)

diff --git a/src/cmd/prof/Makefile b/src/cmd/prof/Makefile
index 055cb3dd1aeaea5d9faca831e262cd752c204cdf..8d785b4aaf35e0d0518739e8ed17a4e7056616ed 100644 (file)
--- a/src/cmd/prof/Makefile
+++ b/src/cmd/prof/Makefile
@@ -30,6 +30,6 @@ install-darwin: $(TARG)
        @true
 
 install-default: $(TARG)
-       cp $(TARG) $(BIN)/$(TARG)
+       cp $(TARG) $(GOBIN)/$(TARG)
 
 $(OFILES): $(HFILES)

diff --git a/src/make.bash b/src/make.bash
index 6374f0b9e584852f4c6482bfef90249e01d3d537..f8f4b8e7305ad58e424a8a0cdefa8523dca87dd9 100755 (executable)
--- a/src/make.bash
+++ b/src/make.bash
@@ -4,6 +4,7 @@
 # license that can be found in the LICENSE file.
 
 set -e
+GOBIN="${GOBIN:-$HOME/bin}"
 export MAKEFLAGS=-j4
 
 if ! test -f $GOROOT/include/u.h
@@ -14,9 +15,9 @@ fi
 
 bash clean.bash
 
-rm -f $HOME/bin/quietgcc
-cp quietgcc.bash $HOME/bin/quietgcc
-chmod +x $HOME/bin/quietgcc
+rm -f $GOBIN/quietgcc
+cp quietgcc.bash $GOBIN/quietgcc
+chmod +x $GOBIN/quietgcc
 
 for i in lib9 libbio libmach_amd64 libregexp cmd pkg cmd/ebnflint cmd/gobuild cmd/godoc cmd/gofmt
 do

diff --git a/test/run b/test/run
index 9ef2746d38a52c2e0bfb1ab8f33a06746d8a965f..094aa8427fa370241e2e27d7a627232a9aa7174c 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -24,7 +24,7 @@ export GOTRACEBACK=0
 
 failed=0
 
-PATH=/bin:/usr/bin:$HOME/bin:`pwd`
+PATH=/bin:/usr/bin:${GOBIN:-$HOME/bin}:`pwd`
 
 RUNFILE=/tmp/gorun-$$-$USER
 TMP1FILE=/tmp/gotest1-$$-$USER

diff --git a/usr/gri/pretty/Makefile b/usr/gri/pretty/Makefile
index 3171a087a50242ba89d5c4ba28f6d0099468c75a..2b323c8a59d242891841415bdebb29bc18ff611c 100644 (file)
--- a/usr/gri/pretty/Makefile
+++ b/usr/gri/pretty/Makefile
@@ -2,6 +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.conf
 include $(GOROOT)/src/Make.$(GOARCH)
 
 all: godoc gofmt
@@ -19,8 +20,8 @@ smoketest: gofmt
        ./test.sh $(GOROOT)/src/pkg/go/printer/printer.go
 
 install: pretty godoc untab
-       cp godoc $(HOME)/bin/godoc
-       cp gofmt $(HOME)/bin/gofmt
+       cp godoc $(GOBIN)/godoc
+       cp gofmt $(GOBIN)/gofmt
 
 clean:
        rm -f godoc gofmt *.$O *.a 6.out *~