summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2002-04-18 20:54:51 +0000
committeragc <agc@pkgsrc.org>2002-04-18 20:54:51 +0000
commitb905c0d8debe88207662db1769d6c1d2c8fa35f2 (patch)
tree225012c33141a057f40df1d074255fdcc11b8e89 /mk
parent3fb915ea3b295e9c172b7fa1b12549a77a6d5520 (diff)
downloadpkgsrc-b905c0d8debe88207662db1769d6c1d2c8fa35f2.tar.gz
In the do-su-install target, when the ${WRKDIR} contains an outdated
version of the package, and an attempt is made to install the package, first "make clean" and then "make build" to pick up the new version of the package before continuing with "make install", rather than printing an error message and dying.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index dee2d47eb72..26d60a3cd98 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.965 2002/04/18 15:54:34 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.966 2002/04/18 20:54:51 agc Exp $
#
# This file is in the public domain.
#
@@ -2429,10 +2429,10 @@ do-su-install:
case "$$extractname" in \
"") ${ECHO_MSG} "*** Warning: ${WRKDIR} may contain an older version of ${PKGBASE}" ;; \
"${PKGNAME}") ;; \
- *) ${ECHO_MSG} "*** Error: Package version $$extractname in ${WRKDIR}"; \
+ *) ${ECHO_MSG} "*** Warning: Package version $$extractname in ${WRKDIR}"; \
${ECHO_MSG} "*** Current version ${PKGNAME} in pkgsrc directory"; \
- ${ECHO_MSG} "*** Please rebuild the package using the newer version: \"${MAKE} clean && ${MAKE}\""; \
- exit 1 ;; \
+ ${ECHO_MSG} "*** Cleaning and rebuilding the newer version of the package..."; \
+ ${MAKE} clean && ${MAKE} build ;; \
esac
@${ECHO_MSG} "${_PKGSRC_IN}> Installing for ${PKGNAME}"
${_PKG_SILENT}${_PKG_DEBUG} \