diff options
author | joerg <joerg> | 2009-02-13 11:30:07 +0000 |
---|---|---|
committer | joerg <joerg> | 2009-02-13 11:30:07 +0000 |
commit | c9c0f3c19e2ead0876a3c79fc0e028e2fce046bc (patch) | |
tree | 0a009088c7a3e07a2a05930d5d7bf74ff1359b91 | |
parent | c00f2889f170c262f8e3a24acf2dfae1b6b42492 (diff) | |
download | pkgsrc-c9c0f3c19e2ead0876a3c79fc0e028e2fce046bc.tar.gz |
package-install with DESTDIR should pass down -A as needed to get
automatic installed handling correct.
-rw-r--r-- | mk/flavor/pkg/package.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mk/flavor/pkg/package.mk b/mk/flavor/pkg/package.mk index 4773499f855..7aed78bfb45 100644 --- a/mk/flavor/pkg/package.mk +++ b/mk/flavor/pkg/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.16 2008/01/23 14:07:07 rillig Exp $ +# $NetBSD: package.mk,v 1.17 2009/02/13 11:30:07 joerg Exp $ PKG_SUFX?= .tgz PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} @@ -141,5 +141,8 @@ su-real-package-install: @${SED} -e 's|@cwd ${_CROSS_DESTDIR}|@cwd |' ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS > ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp @${MV} ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS.tmp ${_PKG_DBDIR}/${PKGNAME:Q}/+CONTENTS .else - ${PKG_ADD} ${PKGFILE} + case ${_AUTOMATIC:Q}"" in \ + [yY][eE][sS]) ${PKG_ADD} -A ${PKGFILE} ;; \ + *) ${PKG_ADD} ${PKGFILE} ;; \ + esac .endif |