From: Andrew Gerrand <adg@golang.org>
Date: Fri, 16 Aug 2013 03:14:13 +0000 (+1000)
Subject: misc/dist: don't copy godoc templates to lib/godoc
X-Git-Tag: go1.2rc2~531
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b1d64f20f29be25b037e814795ef590ea61af662;p=gostls13.git

misc/dist: don't copy godoc templates to lib/godoc

They're baked into the godoc binary now.

R=golang-dev, alex.brainman
CC=golang-dev
https://golang.org/cl/12751047
---

diff --git a/misc/dist/bindist.go b/misc/dist/bindist.go
index 754bd280c2..5bb3c8be13 100644
--- a/misc/dist/bindist.go
+++ b/misc/dist/bindist.go
@@ -424,15 +424,7 @@ func (b *Build) godoc() error {
 	// go get the godoc package.
 	// The go tool knows to install to $GOROOT/bin.
 	_, err := b.run(b.gopath, filepath.Join(b.root, "bin", "go"), "get", godocPath)
-	if err != nil {
-		return err
-	}
-
-	// Copy templates from go.tools/cmd/godoc/template to GOROOT/lib/godoc.
-	return cpDir(
-		filepath.Join(b.root, "lib", "godoc"),
-		filepath.Join(b.gopath, "src", filepath.FromSlash(godocPath), "template"),
-	)
+	return err
 }
 
 func (b *Build) tour() error {