Mon Jun 15 17:02:14 2009 UTC ()

Bail out before doing anything if PKG_PATH is set.


(joerg)

diff -r1.146 -r1.147 pkgsrc/bootstrap/bootstrap

--- pkgsrc/bootstrap/bootstrap 2009/05/29 15:58:37 1.146
+++ pkgsrc/bootstrap/bootstrap 2009/06/15 17:02:14 1.147

 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: bootstrap,v 1.146 2009/05/29 15:58:37 rillig Exp $
+# $NetBSD: bootstrap,v 1.147 2009/06/15 17:02:14 joerg Exp $
+#
+#
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. All advertising materials mentioning features or use of this software
 @@ -331,26 +331,31 @@ bootstrap_sh=${SH-/bin/sh}
 bootstrap_sh_set=${SH+set}
 # On some newer Ubuntu installations, /bin/sh is a symlink to /bin/dash,
 # whose echo(1) is not BSD-compatible.
 dash_echo_test=`$bootstrap_sh -c 'echo "\\100"'`
 if [ "$dash_echo_test" = "@" ]; then
 	{ echo "ERROR: Your shell's echo command is not BSD-compatible."
 	  echo "ERROR: Please select another shell by setting the environment"
 	  echo "ERROR: variable SH."
 	} 1>&2
 	exit 1;
 fi
 if [ -n "$PKG_PATH" ]; then
 	echo "ERROR: Please unset PKG_PATH before running bootstrap." 1>&2
 	exit 1;
 fi
 build_start=`date`
 echo_msg "bootstrap command: $0 $@"
 echo_msg "bootstrap started: $build_start"
 # ensure system locations are empty; we will set them later when we know
 # whether they will be system wide or user specific
 prefix=
 pkgdbdir=
 pkgmandir=
 sysconfdir=
 varbase=
 full=no