3 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index aa1c4b0..2a6acd1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-01  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* Makefoo.am (PATH): Move definition...
+	* configure.ac: ... here.
+
 2008-05-31  Thomas Schwinge  <tschwinge@gnu.org>
 
 	* configure.ac (USER_CFLAGS, KERNEL_CFLAGS, CHECK_CFLAGS): Don't
diff --git a/Makefoo.am b/Makefoo.am
index 313a4ed..bb30aab 100644
--- a/Makefoo.am
+++ b/Makefoo.am
@@ -15,11 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Have the built cross tools appear in `$PATH'.  TODO.  Is that how it is to be
-# done properly?  TODO.  Would $(PATH_SEPARATOR) always be available already?
-PATH_orig := $(shell printenv PATH)
-PATH = $(abspath bin)$(PATH_SEPARATOR)$(PATH_orig)
-
 SYSROOT := $(abspath sysroot)
 
 # Don't use in-place evaluation, as the referenced values may not yet be
diff --git a/configure.ac b/configure.ac
index 644d018..6a6430f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,16 @@ AC_CONFIG_SRCDIR([laden/laden.c])
 AC_CONFIG_HEADER([config.h])
 AC_GNU_SOURCE
 
+
+# Find our cross compiler.
+p=$(readlink -f .)/bin
+case $PATH_SEPARATOR$PATH$PATH_SEPARATOR in
+  *$PATH_SEPARATOR$p$PATH_SEPARATOR*) :;;
+  *) PATH=$p$PATH_SEPARATOR$PATH;;
+esac
+AC_SUBST([PATH])
+
+
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O