diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 84b853d7e3..f4c1af3b00 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 Wed May 31 12:04:01 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
 
+	* nlm/configure.in: Use sed instead of awk to get the value of
+	  cpufile.  Awk is not a utility required by the GNU coding
+	  standards.  This change also fixes the rigid whitespace
+	  requirements that were required for awk.
+
 	* sparclite/aload.c: Use a file descriptor instead of a stdio
 	  stream for i/o with target board.
 	  Use #error if HAVE_TERMIOS is not defined.
diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in
index f50e3cfa8e..436af5b975 100644
--- a/gdb/nlm/configure.in
+++ b/gdb/nlm/configure.in
@@ -23,15 +23,15 @@ sparc*)			gdb_target_cpu=sparc ;;
 
 esac
 
-if [ ! -f ${srcdir}/../config/${gdb_target_cpu}/gdbserve.mt ]; then
+target_makefile_frag=${srcdir}/../config/${gdb_target_cpu}/gdbserve.mt
+if [ ! -f ${target_makefile_frag} ]; then
 	echo '***' "GDBSERVE does not support target ${target}" 1>&2
 	exit 1
 fi
 
-#  We really shouldn't depend on there being a space after CPU_FILE= ...
-cpufile=`awk '$1 == "CPU_FILE=" { print $2 }' <${srcdir}/../config/${gdb_target_cpu}/gdbserve.mt`
-
-target_makefile_frag=../config/${gdb_target_cpu}/gdbserve.mt
+cpufile=`sed -n '
+s/CPU_FILE[ 	]*=[ 	]*\([^ 	]*\)/\1/p
+' ${target_makefile_frag}
 
 # If hostfile (XM_FILE) and/or targetfile (TM_FILE) and/or nativefile
 # (NAT_FILE) is not set in the ?config/* file, we don't make the