diff options
| author | fredb <fredb> | 2002-01-06 23:01:31 +0000 |
|---|---|---|
| committer | fredb <fredb> | 2002-01-06 23:01:31 +0000 |
| commit | 987d4d9ca089f098f345175b8fc392a337edb591 (patch) | |
| tree | a6d97d7c14fa3005b319740b0ac5c12aefd53ee0 /mk | |
| parent | 41b223660c9499a15d87aae1b16c101550be2b07 (diff) | |
| download | pkgsrc-987d4d9ca089f098f345175b8fc392a337edb591.tar.gz | |
Put back the DIST_SUBDIR handling in the _FETCH_ALLFILES macro.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1a3a4019866..44c6ef16a2b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.895 2002/01/06 20:03:22 fredb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.896 2002/01/06 23:01:31 fredb Exp $ # # This file is in the public domain. # @@ -1243,9 +1243,9 @@ MASTER_SORT_AWK+= /${srt:C/\//\\\//g}/ { good["${srt}"] = good["${srt}"] " " $$0 MASTER_SORT_AWK+= { rest = rest " " $$0; } END { n=split(gl, gla); for(i=1;i<=n;i++) { print good[gla[i]]; } print rest; } SORT_SITES_CMD= ${ECHO} $$unsorted_sites | ${AWK} '${MASTER_SORT_AWK}' -ORDERED_SITES= ${MASTER_SITE_OVERRIDE} `${SORT_SITES_CMD}` +ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} `${SORT_SITES_CMD}` .else -ORDERED_SITES= ${MASTER_SITE_OVERRIDE} $$unsorted_sites +ORDERED_SITES= ${_MASTER_SITE_OVERRIDE} $$unsorted_sites .endif # @@ -1275,7 +1275,7 @@ _FETCH_ALLFILES= ${MKDIR} ${_DISTDIR}; _FETCH_ALLFILES+= cd ${_DISTDIR}; . for fetchfile in ${_ALLFILES} _FETCH_ALLFILES+= \ - unsorted_sites="${SITES_${fetchfile:T}} ${MASTER_SITE_BACKUP}"; \ + unsorted_sites="${SITES_${fetchfile:T}} ${_MASTER_SITE_BACKUP}"; \ sites="${ORDERED_SITES}"; \ file="${fetchfile}"; \ bfile="${fetchfile:T}"; \ |