HTRACE-71 Address Billie Renaldi comments on RC6 (.gitignore clash and 'pkg' still in src tarball)
Conflicts:
LICENSE.txt
diff --git a/LICENSE.txt b/LICENSE.txt
index 9667e15..a2ba0e6 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -222,3 +222,7 @@
Gorilla mux gorilla/mux implements a request router and dispatcher is BSD licensed
( https://github.com/gorilla/mux/blob/master/LICENSE
+
+godep, a build dependency is Copyright © 2013 Keith Rarick
+and portions Copyright (c) 2012 The Go Authors. Its a BSD
+license: https://github.com/tools/godep/blob/master/License
diff --git a/htrace-core/src/go/gobuild.sh b/htrace-core/src/go/gobuild.sh
index 7c0e52f..4aad01b 100755
--- a/htrace-core/src/go/gobuild.sh
+++ b/htrace-core/src/go/gobuild.sh
@@ -79,7 +79,7 @@
case $ACTION in
clean)
- rm -rf -- "${GOBIN}" pkg
+ rm -rf -- "${GOBIN}" ${SCRIPT_DIR}/pkg
find "${SCRIPT_DIR}/src/org/apache/htrace/resource" ! -name 'catalog.go' \
-type f -exec rm -f {} +
;;
