rename the source directory for gopack from ar to gopack.

remove the references to 6ar

R=rsc
DELTA=3547  (1770 added, 1775 deleted, 2 changed)
OCL=35669
CL=35671

diff --git a/src/cmd/clean.bash b/src/cmd/clean.bash
index 8432c9f22bb49720281ed913ae7043e5e8d51389..f6863281051f7271892f8e1db0dad5a0255b5c84 100644 (file)
--- a/src/cmd/clean.bash
+++ b/src/cmd/clean.bash
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g ar db nm acid cgo cov ebnflint godefs godoc gofmt prof gotest
+for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g gopack db nm acid cgo cov ebnflint godefs godoc gofmt prof gotest
 do
        cd $i
        make clean

diff --git a/src/cmd/ar/Makefile b/src/cmd/gopack/Makefile
similarity index 67%
rename from src/cmd/ar/Makefile
rename to src/cmd/gopack/Makefile
index cbed2617d8868832216123f873ff30ad4d0582fc..d95c9dd9d65196a4c0a736ab4af48b57a5856f91 100644 (file)
--- a/src/cmd/ar/Makefile
+++ b/src/cmd/gopack/Makefile
@@ -4,10 +4,6 @@
 
 include ../../Make.conf
 
-# The directory is ar because the source is portable and general.
-# We call the binary 6ar to avoid confusion and because this binary
-# is linked only with amd64 and x86 support.
-
 TARG=gopack
 OFILES=\
        ar.$O\

diff --git a/src/cmd/ar/ar.c b/src/cmd/gopack/ar.c
similarity index 100%
rename from src/cmd/ar/ar.c
rename to src/cmd/gopack/ar.c

diff --git a/src/cmd/make.bash b/src/cmd/make.bash
index ca4517218e3bf22d5aaa56b3e64242e6f6e38e8f..25bcd38e7982d1958b8910e0fead6394d7188ac9 100644 (file)
--- a/src/cmd/make.bash
+++ b/src/cmd/make.bash
@@ -18,7 +18,7 @@ bash mkenam
 make enam.o
 cd ..
 
-for i in cc ${O}l ${O}a ${O}c gc ${O}g ar db nm acid cov godefs prof gotest
+for i in cc ${O}l ${O}a ${O}c gc ${O}g gopack db nm acid cov godefs prof gotest
 do
        echo; echo; echo %%%% making $i %%%%; echo
        cd $i