diff options
| author | bsiegert <bsiegert> | 2017-03-20 22:33:21 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2017-03-20 22:33:21 +0000 |
| commit | 93a7800d6581c6f2c2c65cca9a727156a9351deb (patch) | |
| tree | 470cae586d2c5c9a0a0e1f2826467e9686f1d344 /lang | |
| parent | d91f0fe8dbfe1692d616d0f779eb26e4a2de9199 (diff) | |
| download | pkgsrc-93a7800d6581c6f2c2c65cca9a727156a9351deb.tar.gz | |
Do not take the basename of GO_DIST_BASE when it is overridden. Needed for
fixing PR pkg/52081.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/go/go-package.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lang/go/go-package.mk b/lang/go/go-package.mk index e95a0ebddfc..c1f3af1dec6 100644 --- a/lang/go/go-package.mk +++ b/lang/go/go-package.mk @@ -1,4 +1,4 @@ -# $NetBSD: go-package.mk,v 1.9 2017/03/15 19:48:40 bsiegert Exp $ +# $NetBSD: go-package.mk,v 1.10 2017/03/20 22:33:21 bsiegert Exp $ # # This file implements common logic for compiling Go programs in pkgsrc. # The compiled Go code is tied to a specific compiler version, and the @@ -37,7 +37,8 @@ .include "../../lang/go/version.mk" -GO_DIST_BASE?= ${GO_SRCPATH} +_GO_DIST_BASE!= basename ${GO_SRCPATH} +GO_DIST_BASE?= ${_GO_DIST_BASE} GO_BUILD_PATTERN?= ${GO_SRCPATH}/... WRKSRC= ${WRKDIR}/src/${GO_SRCPATH} @@ -58,8 +59,8 @@ PRINT_PLIST_AWK+= { gsub(/${GO_PLATFORM}/, \ .if !target(post-extract) post-extract: ${RUN} ${MKDIR} ${WRKSRC} - ${RUN} ${RM} -fr ${WRKDIR}/`basename ${GO_DIST_BASE}`/.hg - ${RUN} ${MV} ${WRKDIR}/`basename ${GO_DIST_BASE}`/* ${WRKSRC} + ${RUN} ${RM} -fr ${WRKDIR}/${GO_DIST_BASE}/.hg + ${RUN} ${MV} ${WRKDIR}/${GO_DIST_BASE}/* ${WRKSRC} .endif .if !target(do-build) |