CVS commit: pkgsrc/lang/go

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sun Oct 14 18:15:34 UTC 2018

Modified Files:
        pkgsrc/lang/go: go-package.mk

Log Message:
Correct definition of GOTOOLDIR, remove PREFIX.

GOTOOLDIR was not updated to use the versioned go directories.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/lang/go/go-package.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/go/go-package.mk
diff -u pkgsrc/lang/go/go-package.mk:1.18 pkgsrc/lang/go/go-package.mk:1.19
--- pkgsrc/lang/go/go-package.mk:1.18   Sat Sep 22 19:44:21 2018
+++ pkgsrc/lang/go/go-package.mk        Sun Oct 14 18:15:34 2018
@@ -1,4 +1,4 @@
-# $NetBSD: go-package.mk,v 1.18 2018/09/22 19:44:21 bsiegert Exp $
+# $NetBSD: go-package.mk,v 1.19 2018/10/14 18:15:34 bsiegert Exp $
 #
 # This file implements common logic for compiling Go programs in pkgsrc.
 #
@@ -63,7 +63,7 @@ USE_TOOLS+=           pax
 BUILD_DEPENDS+=                ${GO_PACKAGE_DEP}
 
 GO_PLATFORM=           ${LOWER_OPSYS}_${GOARCH}
-GOTOOLDIR=             ${PREFIX}/go/pkg/tool/${GO_PLATFORM}
+GOTOOLDIR=             go${GOVERSSUFFIX}/pkg/tool/${GO_PLATFORM}
 
 PRINT_PLIST_AWK+=      /${GO_PLATFORM}/ { gsub(/${GO_PLATFORM}/, \
                        "$${GO_PLATFORM}"); \