diff options
| author | hubertf <hubertf> | 1998-02-28 16:02:21 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 1998-02-28 16:02:21 +0000 |
| commit | 92e473c3a8834a35ca51ee5a80c600cf906d355f (patch) | |
| tree | c9fb9f80fc8e0169e6553c559cb9c99be54181c2 /mk | |
| parent | 5e5a8bd223621b9bfb6825b6ca62d284b762646c (diff) | |
| download | pkgsrc-92e473c3a8834a35ca51ee5a80c600cf906d355f.tar.gz | |
Cleanup fetch-list change reported by Bernd Ernesti..
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 | ||||
| -rw-r--r-- | mk/bsd.port.mk | 14 |
2 files changed, 16 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index f7b9c1e8ae0..94255c66d5c 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.pkg.mk,v 1.52 1998/02/28 10:39:19 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.53 1998/02/28 16:02:21 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1509,21 +1509,23 @@ fetch-list-recursive: .if !target(fetch-list-one-pkg) fetch-list-one-pkg: - @for file in ${DISTFILES}; do \ - [ -z "${DIST_SUBDIR}" ] || ${ECHO} -n "${MKDIR} ${DIST_SUBDIR} && cd ${DIST_SUBDIR} && " ; \ + @${MKDIR} ${_DISTDIR} + @[ -z "${_DISTDIR}" ] || ${ECHO} "${MKDIR} ${_DISTDIR}" + @(cd ${_DISTDIR}; \ + for file in ${DISTFILES}; do \ if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - ${ECHO} -n "[ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ + ${ECHO} -n "cd ${_DISTDIR} && [ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ for site in ${MASTER_SITES} ; do \ ${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ ${ECHO} "echo $${file} not fetched" ; \ fi \ - done + done) .if defined(PATCHFILES) @(cd ${_DISTDIR}; \ for file in ${PATCHFILES}; do \ if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - ${ECHO} -n "[ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ + ${ECHO} -n "cd ${_DISTDIR} && [ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ for site in ${PATCH_SITES}; do \ ${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk index f88d433395c..2f024534581 100644 --- a/mk/bsd.port.mk +++ b/mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $NetBSD: bsd.port.mk,v 1.52 1998/02/28 10:39:19 tron Exp $ +# $NetBSD: bsd.port.mk,v 1.53 1998/02/28 16:02:21 hubertf Exp $ # # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. @@ -1509,21 +1509,23 @@ fetch-list-recursive: .if !target(fetch-list-one-pkg) fetch-list-one-pkg: - @for file in ${DISTFILES}; do \ - [ -z "${DIST_SUBDIR}" ] || ${ECHO} -n "${MKDIR} ${DIST_SUBDIR} && cd ${DIST_SUBDIR} && " ; \ + @${MKDIR} ${_DISTDIR} + @[ -z "${_DISTDIR}" ] || ${ECHO} "${MKDIR} ${_DISTDIR}" + @(cd ${_DISTDIR}; \ + for file in ${DISTFILES}; do \ if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - ${ECHO} -n "[ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ + ${ECHO} -n "cd ${_DISTDIR} && [ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ for site in ${MASTER_SITES} ; do \ ${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ ${ECHO} "echo $${file} not fetched" ; \ fi \ - done + done) .if defined(PATCHFILES) @(cd ${_DISTDIR}; \ for file in ${PATCHFILES}; do \ if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \ - ${ECHO} -n "[ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ + ${ECHO} -n "cd ${_DISTDIR} && [ -f $$file -o -f `${BASENAME} $$file` ] || " ; \ for site in ${PATCH_SITES}; do \ ${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '|| ' ; \ done; \ |