goinstall: honour -install=false flag when -make=true

R=rsc
CC=golang-dev
https://golang.org/cl/5448124

diff --git a/src/cmd/goinstall/make.go b/src/cmd/goinstall/make.go
index 1a52ab2e72edc76a17ff2346dcc029342e232f74..1e40d6ea37b4fe30fc9694fad2c70dcf0202d037 100644 (file)
--- a/src/cmd/goinstall/make.go
+++ b/src/cmd/goinstall/make.go
@@ -29,7 +29,12 @@ func domake(dir, pkg string, tree *build.Tree, isCmd bool) (err error) {
        } else if *clean {
                cmd = append(cmd, "clean")
        }
-       cmd = append(cmd, "install")
+       if *doInstall {
+               cmd = append(cmd, "install")
+       }
+       if len(cmd) <= 3 { // nothing to do
+               return nil
+       }
        return run(dir, makefile, cmd...)
 }