CVS commit: pkgsrc/mk/fetch

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Mon Mar 30 22:44:26 UTC 2020

Modified Files:
        pkgsrc/mk/fetch: fetch.mk

Log Message:
mk/fetch/fetch.mk: don't print double-slash in pathname


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/mk/fetch/fetch.mk

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

Modified files:

Index: pkgsrc/mk/fetch/fetch.mk
diff -u pkgsrc/mk/fetch/fetch.mk:1.70 pkgsrc/mk/fetch/fetch.mk:1.71
--- pkgsrc/mk/fetch/fetch.mk:1.70       Thu Jan 11 08:54:37 2018
+++ pkgsrc/mk/fetch/fetch.mk    Mon Mar 30 22:44:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.70 2018/01/11 08:54:37 alnsn Exp $
+# $NetBSD: fetch.mk,v 1.71 2020/03/30 22:44:26 rillig Exp $
 
 .if empty(INTERACTIVE_STAGE:Mfetch) && empty(FETCH_MESSAGE:U)
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -316,7 +316,7 @@ do-fetch-file: .USE
                case $$d in                                             \
                ""|${DISTDIR})  continue ;;                             \
                esac;                                                   \
-               file="$$d/${DIST_SUBDIR}/${.TARGET:T}";                 \
+               file="$$d/${DIST_SUBDIR:D${DIST_SUBDIR}/}${.TARGET:T}"; \
                if ${TEST} -f $$file; then                              \
                        ${ECHO} "Using $$file";                         \
                        ${RM} -f ${.TARGET};                            \