BIND 10 master, updated. 005cba1c8d62e2f44ad05b512ac9b7be639da725 [master] make sure the top-level bind10 program honors from-build env.

[BIND 10 source code commits]

The branch, master has been updated
       via  005cba1c8d62e2f44ad05b512ac9b7be639da725 (commit)
      from  ffd4a283b18f8eaa453712e1e615e2440b12aa0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 005cba1c8d62e2f44ad05b512ac9b7be639da725
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Tue Feb 5 15:45:12 2013 -0800

    [master] make sure the top-level bind10 program honors from-build env.
    
    without this lettuce tests doesn't work in-source.
    a kind of regression due to #1901
    (cherry picked from commit 0749f9e194505698031990eb7c544e8ec076fe10)

-----------------------------------------------------------------------

Summary of changes:
 src/bin/bind10/bind10.in |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/bind10/bind10.in b/src/bin/bind10/bind10.in
index fe8c0cc..6421bab 100755
--- a/src/bin/bind10/bind10.in
+++ b/src/bin/bind10/bind10.in
@@ -1,4 +1,9 @@
 #!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec @libexecdir@/@PACKAGE@/b10-init $*
+
+if test -n "${B10_FROM_BUILD}"; then
+	exec ${B10_FROM_BUILD}/src/bin/bind10/b10-init $*
+else
+	prefix=@prefix@
+	exec_prefix=@exec_prefix@
+	exec @libexecdir@/@PACKAGE@/b10-init $*
+fi