diff options
| author | rh <rh@pkgsrc.org> | 2000-07-18 08:21:41 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2000-07-18 08:21:41 +0000 |
| commit | 54232daa5bc3beb26f1eae240e49b2f7f1579248 (patch) | |
| tree | b919d2465ffabcb77d17dfffe83adfbf84da194c /mk/bsd.pkg.mk | |
| parent | 7f485f7ba3d4571fb462c02a8ae237a1f33ee230 (diff) | |
| download | pkgsrc-54232daa5bc3beb26f1eae240e49b2f7f1579248.tar.gz | |
Fix the ${DDIR} target to work with multi-component paths. This makes the
update target work with pkgsrc installations that have more (or less) than
two components (like /src/NetBSD-current/pkgsrc). Thanks for Matthias
Scheler for noting this!
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 07b282814bb..b4b5002c363 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.507 2000/07/15 21:36:22 agc Exp $ +# $NetBSD: bsd.pkg.mk,v 1.508 2000/07/18 08:21:41 rh Exp $ # # This file is in the public domain. # @@ -1980,13 +1980,14 @@ update-dirlist: ${DDIR}: ${DLIST} ${_PKG_SILENT}${_PKG_DEBUG} \ ddir=`${SED} 's:-[^-]*$$::' <${DLIST}`; \ - if ${PKG_INFO} -b $${ddir} >/dev/null 2>&1 ; then \ - ${PKG_INFO} -b $${ddir} | \ - ${SED} -ne 's,^\([^/]*/[^/]*\)/Makefile:.*,\1,p' \ - >${DDIR}; \ - else \ - ${ECHO} >${DDIR}; \ - fi + ${ECHO} >${DDIR}; \ + for pkg in $${ddir} ; do \ + if ${PKG_INFO} -b $${pkg} >/dev/null 2>&1 ; then \ + ${PKG_INFO} -b $${pkg} | \ + ${SED} -ne "s,\([^/]*/$${pkg}\)/Makefile:.*,\1,p" \ + >>${DDIR}; \ + fi ; \ + done ${DLIST}: ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} -p ${WRKDIR} |