diff options
| author | hubertf <hubertf> | 2000-05-31 02:08:04 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2000-05-31 02:08:04 +0000 |
| commit | d705d0f6fc6c1f366d56526a43af6aaac94c32e5 (patch) | |
| tree | 9f03934228ada4d8ff905c804529b61da774af37 /mk | |
| parent | 0f6845ceda9a7585b27dde246bfd7ca623551af8 (diff) | |
| download | pkgsrc-d705d0f6fc6c1f366d56526a43af6aaac94c32e5.tar.gz | |
* rename root-install-flags to root-deinstall-flags (it's used in
root-DEinstall, after all :)
* while there, pass these flags to the pkg_delete called for dependencies.
Now "make deinstall DEINSTALLDEPENDS=yes" should actually work, i.e. no
BUILD_DEPENDS should be left behind. (Hi Dan!)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index fa868c8fc83..70f55935aad 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.444 2000/05/31 01:07:14 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.445 2000/05/31 02:08:04 hubertf Exp $ # # This file is in the public domain. # @@ -1792,22 +1792,22 @@ pkg-su-deinstall: uptodate-pkgtools .if (${DEINSTALLDEPENDS} != "NO") .if (${DEINSTALLDEPENDS} != "ALL") # used for removing stuff in bulk builds -root-install-flags+= -r -R +root-deinstall-flags+= -r -R # used for "update" target .else -root-install-flags+= -r +root-deinstall-flags+= -r .endif .endif .ifdef PKG_VERBOSE -root-install-flags+= -v +root-deinstall-flags+= -v .endif root-deinstall: ${_PKG_SILENT}${_PKG_DEBUG} \ found=`${PKG_INFO} -e "${PKGNAME:C/-[^-]*$/-[0-9]*/}" || ${TRUE}` ; \ if [ "$$found" != "" ]; then \ - ${ECHO} Running ${PKG_DELETE} ${root-install-flags} $$found ; \ - ${PKG_DELETE} ${root-install-flags} $$found || ${TRUE} ; \ + ${ECHO} Running ${PKG_DELETE} ${root-deinstall-flags} $$found ; \ + ${PKG_DELETE} ${root-deinstall-flags} $$found || ${TRUE} ; \ fi .if (${DEINSTALLDEPENDS} != "NO") && (${DEINSTALLDEPENDS} != "ALL") @${SHCOMMENT} Also remove BUILD_DEPENDS: @@ -1816,7 +1816,7 @@ root-deinstall: found=`${PKG_INFO} -e "${pkg}" || ${TRUE}` ; \ if [ "$$found" != "" ]; then \ ${ECHO} Running ${PKG_DELETE} $$found ; \ - ${PKG_DELETE} $$found || ${TRUE} ; \ + ${PKG_DELETE} ${root-deinstall-flags} $$found || ${TRUE} ; \ fi .endfor .endif # DEINSTALLDEPENDS |