summaryrefslogtreecommitdiff
path: root/mk/bulk
diff options
context:
space:
mode:
authorhe <he@pkgsrc.org>2008-06-08 21:04:30 +0000
committerhe <he@pkgsrc.org>2008-06-08 21:04:30 +0000
commita8e2184877b4e6595670f739c358e1fbc90bc2bc (patch)
treeb846e7196c75b3e12e04f3399b05e38a054b6ce5 /mk/bulk
parent9c0077dc1ef33ae1639254eed113f84663a9f0a2 (diff)
downloadpkgsrc-a8e2184877b4e6595670f739c358e1fbc90bc2bc.tar.gz
Commit two fixes which at least for me appear to be required when
doing an old-style bulk build on 4.0 or older systems: - in mk/bulk/build, do "make update" instead of "make install + clean" when installing a new pkg_install - in pkgtools/pkg_install/Makefile, don't try to use our own executables (${WORKDIR}/pkg_add/pkg_add etc.) if they don't exist Discussed with joerg, and even though he's not entirely happy with the latter change, he didn't appear to have a better suggestion. This, and putting /usr/pkg/sbin earlier than /usr/sbin in the $PATH appears to be required to get an old-style bulk build going.
Diffstat (limited to 'mk/bulk')
-rw-r--r--mk/bulk/build5
1 files changed, 2 insertions, 3 deletions
diff --git a/mk/bulk/build b/mk/bulk/build
index a85a2db0e9c..a0e8b52c43d 100644
--- a/mk/bulk/build
+++ b/mk/bulk/build
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: build,v 1.103 2008/01/04 15:49:07 rillig Exp $
+# $NetBSD: build,v 1.104 2008/06/08 21:04:30 he Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -232,8 +232,7 @@ check_tools () {
echo "build> Updating pkgtools"
( cd "${pkgsrc_dir}/pkgtools/pkg_install" \
&& ${BMAKE} clean \
- && ${BMAKE} install \
- && ${BMAKE} clean
+ && ${BMAKE} update
) || die "Could not update the package tools."
}
}