Parcourir la source

[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)
JINMEI Tatuya il y a 12 ans
Parent
commit
005cba1c8d
1 fichiers modifiés avec 8 ajouts et 3 suppressions
  1. 8 3
      src/bin/bind10/bind10.in

+ 8 - 3
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