go: Don't conflict with gcc's go (which is required for bootstrap)

Install correctly so we can find the go src/libaries
(e.g. archive goes under go/src/archive instead of go/src/src/archive)
'include' is no more

3 files changed, 10 insertions, 3 deletions

diff --git a/devel/go/BUILD b/devel/go/BUILD
index 90d733e017..24ae3acf37 100755
--- a/devel/go/BUILD
+++ b/devel/go/BUILD
@@ -3,7 +3,7 @@ export GOROOT_BOOTSTRAP="${TRACK_ROOT}"/usr  &&
 export GOROOT_FINAL=${TARGET_ROOT}/opt/go    &&
 export GOARCH                                &&
 export GOOS=linux                            &&
-export GOBIN=${INSTALL_ROOT}/usr/bin/        &&
+export GOBIN=${INSTALL_ROOT}/opt/go/bin/     &&
 cd ${SOURCE_DIRECTORY}/src                   &&
 
 check_tmp_noexec /tmp &&
diff --git a/devel/go/HISTORY b/devel/go/HISTORY
index 5bb2e540f1..615bd4ef69 100644
--- a/devel/go/HISTORY
+++ b/devel/go/HISTORY
@@ -1,3 +1,9 @@
+2016-03-24 Eric Sandall <sandalle@sourcemage.org>
+	* BUILD: Don't conflict with gcc's go (which is required for bootstrap)
+	* INSTALL: Install correctly so we can find the go src/libaries
+	  (e.g. archive goes under go/src/archive instead of go/src/src/archive)
+	  'include' is no more
+
 2016-03-23 Eric Sandall <sandalle@sourcemage.org>
 	* DETAILS: Updated to 1.6 (now compiles for me)
 	* DEPENDS: Depends on GCC built with 'GO' (gccgo) for bootstrapping.
diff --git a/devel/go/INSTALL b/devel/go/INSTALL
index d30e78e68b..d9bf5e5d4e 100755
--- a/devel/go/INSTALL
+++ b/devel/go/INSTALL
@@ -1,5 +1,6 @@
 mkdir -p ${INSTALL_ROOT}/opt/go &>/dev/null &&
 
-for d in doc include lib pkg src; do
-  cp -r "${SOURCE_DIRECTORY}/${d}" "${INSTALL_ROOT}/opt/go/${d}"
+for d in doc lib pkg src; do
+  install -d -m 0755 -o root -g root "${INSTALL_ROOT}"/opt/go/${d}   &&
+  cp -r "${SOURCE_DIRECTORY}"/${d}/* "${INSTALL_ROOT}"/opt/go/${d}/
 done