diff options
| author | joerg <joerg> | 2007-04-12 14:36:40 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-04-12 14:36:40 +0000 |
| commit | 4c6ae127741d416ed73f9d1047bae53d01a9361c (patch) | |
| tree | 12ade78f5cb243a92c529b2c2cba8f6dfa08a166 /bootstrap | |
| parent | d0e026fcb0a4b22c679eb6d52cd46e62d4910eec (diff) | |
| download | pkgsrc-4c6ae127741d416ed73f9d1047bae53d01a9361c.tar.gz | |
When calling bootstrap-register from the bootstrap script for the
various packages, pass down PKG_PRESERVE. Remove the default setting of
PKG_PRESERVE, it makes perfect sense to install e.g. pkgtools/mtree
and be able to remove it again, if it is not an essientiel tool.
OK jlam@
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index ca2b7f46bd5..262fa96d489 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.92 2007/03/02 16:48:48 wiz Exp $ +# $NetBSD: bootstrap,v 1.93 2007/04/12 14:36:40 joerg Exp $ # # # Copyright (c) 2001-2002 Alistair G. Crooks. All rights reserved. @@ -889,11 +889,11 @@ echo ".endif # end pkgsrc settings" >> ${MKCONF_EXAMPLE} # register packages # usage: register_package <packagedirectory> [additional arguments] register_package() { - run_cmd "(cd $pkgsrcdir/$1 && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=${wrkobjdir} ${2-} bootstrap-register)" + run_cmd "(cd $pkgsrcdir/$1 && $bmake -DPKG_PRESERVE MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=${wrkobjdir} ${2-} bootstrap-register)" } echo_msg "Registering installed packages" -run_cmd "(cd $pkgsrcdir/pkgtools/bootstrap-mk-files && $bmake MAKECONF=${MKCONF_EXAMPLE} WRKOBJDIR=$wrkobjdir bootstrap-register)" +register_package "pkgtools/bootstrap-mk-files" case "$need_awk" in yes) register_package "lang/nawk";; esac |