diff --git a/ChangeLog b/ChangeLog
index 8ca95e79c1..37cd60950b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2001-12-05  Geoff Keating  <geoffk@redhat.com>
 
+	* scripts/cpp: Test the exit status from 'type', not 'awk'.
+
 	* sysdeps/powerpc/__longjmp.S: Don't restore FP registers.
 	* sysdeps/powerpc/fpu/__longjmp.S: Do restore FP registers.
 	* sysdeps/powerpc/setjmp.S: Don't save FP registers.
diff --git a/scripts/cpp b/scripts/cpp
index 4a62f1e5ae..24112c663c 100755
--- a/scripts/cpp
+++ b/scripts/cpp
@@ -1,8 +1,9 @@
 #! /bin/sh
 cpp=`which cpp 2>/dev/null`
 if test $? -ne 0; then
-  cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
-  if test $? -ne 0; then
+  if type cpp 2>/dev/null >/dev/null; then
+    cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
+  else
     cpp=`gcc -print-file-name=cpp 2>/dev/null`
     if test $? -ne 0; then
       if test -x /lib/cpp; then