- install doc in lib/go

- adjust dependent files

R=rsc
DELTA=1132  (567 added, 562 deleted, 3 changed)
OCL=27862
CL=27862

diff --git a/src/lib/go/Makefile b/src/lib/go/Makefile
index bfe1cede3519c34856e15e574768d60d52fa58a5..5e56c932ec177aeaa58a7e06e84e25cbc962a3dd 100644 (file)
--- a/src/lib/go/Makefile
+++ b/src/lib/go/Makefile
@@ -47,11 +47,13 @@ O2=\
        ast.$O\
 
 O3=\
+       doc.$O\
        parser.$O\
 
 
 phases: a1 a2 a3
 _obj$D/ast.a: phases
+_obj$D/doc.a: phases
 _obj$D/parser.a: phases
 _obj$D/scanner.a: phases
 _obj$D/token.a: phases
@@ -66,6 +68,7 @@ a2: $(O2)
        rm -f $(O2)
 
 a3: $(O3)
+       $(AR) grc _obj$D/doc.a doc.$O
        $(AR) grc _obj$D/parser.a parser.$O
        rm -f $(O3)
 
@@ -73,6 +76,7 @@ a3: $(O3)
 newpkg: clean
        mkdir -p _obj$D
        $(AR) grc _obj$D/ast.a
+       $(AR) grc _obj$D/doc.a
        $(AR) grc _obj$D/parser.a
        $(AR) grc _obj$D/scanner.a
        $(AR) grc _obj$D/token.a
@@ -83,13 +87,14 @@ $(O3): a2
 $(O4): a3
 
 nuke: clean
-       rm -f $(GOROOT)/pkg$D/ast.a $(GOROOT)/pkg$D/parser.a $(GOROOT)/pkg$D/scanner.a $(GOROOT)/pkg$D/token.a
+       rm -f $(GOROOT)/pkg$D/ast.a $(GOROOT)/pkg$D/doc.a $(GOROOT)/pkg$D/parser.a $(GOROOT)/pkg$D/scanner.a $(GOROOT)/pkg$D/token.a
 
-packages: _obj$D/ast.a _obj$D/parser.a _obj$D/scanner.a _obj$D/token.a
+packages: _obj$D/ast.a _obj$D/doc.a _obj$D/parser.a _obj$D/scanner.a _obj$D/token.a
 
 install: packages
        test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg$D
        cp _obj$D/ast.a $(GOROOT)/pkg$D/ast.a
+       cp _obj$D/doc.a $(GOROOT)/pkg$D/doc.a
        cp _obj$D/parser.a $(GOROOT)/pkg$D/parser.a
        cp _obj$D/scanner.a $(GOROOT)/pkg$D/scanner.a
        cp _obj$D/token.a $(GOROOT)/pkg$D/token.a

diff --git a/usr/gri/pretty/doc.go b/src/lib/go/doc.go
similarity index 100%
rename from usr/gri/pretty/doc.go
rename to src/lib/go/doc.go

diff --git a/usr/gri/pretty/Makefile b/usr/gri/pretty/Makefile
index 1bb91641bebc99c8ea44f2be59babdfed0941864..da281b1bc8a30ef688c68b7a33311aa5ab84df55 100644 (file)
--- a/usr/gri/pretty/Makefile
+++ b/usr/gri/pretty/Makefile
@@ -30,7 +30,7 @@ install: pretty godoc untab
 clean:
        rm -f pretty untab godoc *.6 *.a 6.out *~
 
-godoc.6:       astprinter.6 comment.6 doc.6
+godoc.6:       astprinter.6 comment.6
 
 pretty.6:       astprinter.6 format.6
 

diff --git a/usr/gri/pretty/godoc.go b/usr/gri/pretty/godoc.go
index 0e39c8ad51296d0bba905ee338596df00c1ae360..e05402f17780fb52798898277aa76ba2c02c1aba 100644 (file)
--- a/usr/gri/pretty/godoc.go
+++ b/usr/gri/pretty/godoc.go
@@ -32,6 +32,7 @@ import (
        "flag";
        "fmt";
        "go/ast";
+       "go/doc";
        "go/parser";
        "go/token";
        "http";
@@ -48,7 +49,6 @@ import (
 
        "astprinter";
        "comment";
-       "doc";
 )