From 1ef88c5ab844515e3a2d89ceef95eeeb88f163b8 Mon Sep 17 00:00:00 2001 From: he Date: Sun, 8 Jun 2008 21:04:30 +0000 Subject: 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. --- mk/bulk/build | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'mk/bulk') 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 @@ -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." } } -- cgit v1.2.3