[pkgsrc/trunk]: pkgsrc/mk/fetch Allow empty DIST_SUBDIR, need to fix PR 35494.

[obache <obache%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/314bcc431e06
branches:  trunk
changeset: 530917:314bcc431e06
user:      obache <obache%pkgsrc.org@localhost>
date:      Sat Jul 14 05:45:35 2007 +0000

description:
Allow empty DIST_SUBDIR, need to fix PR 35494.

diffstat:

 mk/fetch/fetch.mk |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r 5c2e92578cf0 -r 314bcc431e06 mk/fetch/fetch.mk
--- a/mk/fetch/fetch.mk Sat Jul 14 04:39:17 2007 +0000
+++ b/mk/fetch/fetch.mk Sat Jul 14 05:45:35 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: fetch.mk,v 1.25 2007/06/12 09:54:52 obache Exp $
+# $NetBSD: fetch.mk,v 1.26 2007/07/14 05:45:35 obache Exp $
 
 _MASTER_SITE_BACKUP=   ${MASTER_SITE_BACKUP:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
 _MASTER_SITE_OVERRIDE= ${MASTER_SITE_OVERRIDE:=${DIST_SUBDIR}${DIST_SUBDIR:D/}}
@@ -14,7 +14,7 @@
 .endfor
 
 # List of all files, with ${DIST_SUBDIR} in front.  Used for fetch and checksum.
-.if defined(DIST_SUBDIR)
+.if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
 _CKSUMFILES?=  ${CKSUMFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
 _DISTFILES?=   ${DISTFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
 _IGNOREFILES?= ${IGNOREFILES:@.f.@${DIST_SUBDIR}/${.f.}@}
@@ -246,7 +246,11 @@
 .if !empty(PKG_RESUME_TRANSFERS:M[yY][eE][sS])
 _FETCH_ARGS+=  -r
 .endif
-_FETCH_ARGS+=  -d ${DIST_SUBDIR:U.}
+.if defined(DIST_SUBDIR) && !empty(DIST_SUBDIR)
+_FETCH_ARGS+=  -d ${DIST_SUBDIR}
+.else
+_FETCH_ARGS+=  -d .
+.endif
 
 .PHONY: do-fetch-file
 do-fetch-file: .USE