Remove top-level (src/) Makefile.

R=rsc, dho, r
CC=golang-dev
https://golang.org/cl/194045

diff --git a/doc/install.html b/doc/install.html
index 0d7b1850b6beff210df82d11edcea30e33d8dbba..33dacf2cfccf5ae9c5a5fff88870349cfe185315 100644 (file)
--- a/doc/install.html
+++ b/doc/install.html
@@ -208,11 +208,11 @@ To build the Go distribution, run
 
 <pre>
 $ cd $GOROOT/src
-$ make all
+$ ./all.bash
 </pre>
 
 <p>
-If <code>make all</code> goes well, it will finish by printing
+If all goes well, it will finish by printing
 </p>
 
 <pre>

diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644 (file)
index e1b76f8..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# GNU Make syntax:
-nullstring :=
-space := $(nullstring) # a space at the end
-QUOTED_GOROOT=$(subst $(space),\ ,$(GOROOT))
-
-all: build run
-
-build:
-       bash $(QUOTED_GOROOT)/src/make.bash
-
-run:
-       bash $(QUOTED_GOROOT)/src/run.bash
-
-clean:
-       bash $(QUOTED_GOROOT)/src/clean.bash
-

diff --git a/src/all.bash b/src/all.bash
index 8074c571a9ec31c32fd559c1c0da497e696e18c1..67c19cd43fd3fd9b8460cb27a96ccb4088b1ff13 100755 (executable)
--- a/src/all.bash
+++ b/src/all.bash
@@ -1,3 +1,8 @@
-#!/bin/sh
-exec make all
+#!/usr/bin/env bash
+# Copyright 2009 The Go Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
 
+set -e
+bash make.bash
+bash run.bash