diff options
| author | dholland <dholland> | 2016-01-06 07:38:25 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2016-01-06 07:38:25 +0000 |
| commit | cadf0751bc91b5a3ba263e8cf6dd7cce7b631f05 (patch) | |
| tree | 43ff554cd0fd9d01605be87a71c749ad429211b6 /mk | |
| parent | 9f56e4c5f872d07e61804a82110cb888e1dbfa87 (diff) | |
| download | pkgsrc-cadf0751bc91b5a3ba263e8cf6dd7cce7b631f05.tar.gz | |
Use :tA to make DISTINFO_FILE absolute when passing it to the fetch
and checksum scripts.
Fixes the problem where DISTINFO_FILE=../../foo/bar/distinfo doesn't
work without having an extraneous and ugly ${.CURDIR} stuffed into it
by hand.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/checksum/checksum.mk | 4 | ||||
| -rw-r--r-- | mk/fetch/fetch.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/checksum/checksum.mk b/mk/checksum/checksum.mk index 61e42b3fb59..4d82d777b14 100644 --- a/mk/checksum/checksum.mk +++ b/mk/checksum/checksum.mk @@ -1,4 +1,4 @@ -# $NetBSD: checksum.mk,v 1.21 2015/10/12 18:23:48 agc Exp $ +# $NetBSD: checksum.mk,v 1.22 2016/01/06 07:38:25 dholland Exp $ # # See bsd.checksum.mk for helpful comments. # @@ -41,7 +41,7 @@ checksum checksum-phase: case ${.TARGET:Q} in \ *-phase) ${TEST} ! -f ${_COOKIE.checksum} || exit 0 ;; \ esac; \ - if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE} ${_CKSUMFILES}; then \ + if cd ${DISTDIR} && ${_CHECKSUM_CMD} ${DISTINFO_FILE:tA} ${_CKSUMFILES}; then \ ${TRUE}; \ else \ ${ERROR_MSG} "Make sure the Makefile and checksum file (${DISTINFO_FILE})"; \ diff --git a/mk/fetch/fetch.mk b/mk/fetch/fetch.mk index be1a328bade..144326006b2 100644 --- a/mk/fetch/fetch.mk +++ b/mk/fetch/fetch.mk @@ -1,4 +1,4 @@ -# $NetBSD: fetch.mk,v 1.67 2015/09/14 08:27:13 joerg Exp $ +# $NetBSD: fetch.mk,v 1.68 2016/01/06 07:38:25 dholland Exp $ .if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U) _MASTER_SITE_BACKUP= ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}} @@ -260,7 +260,7 @@ _FETCH_CMD= ${PKGSRC_SETENV} CHECKSUM=${_CHECKSUM_CMD:Q} \ _FETCH_ARGS+= ${PKG_VERBOSE:D-v} .if exists(${DISTINFO_FILE}) -_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:Q} +_FETCH_ARGS+= ${FAILOVER_FETCH:D-c} -f ${DISTINFO_FILE:tA:Q} .endif .if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS]) _FETCH_ARGS+= -r |