diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 7bfa5e27df..26f8d15859 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,7 +1,13 @@
+Wed Feb 15 14:23:28 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
+
+	* configure.in, gdb.{base,c++,chill}/configure.in: changed so
+	  *-*-vxworks* matches vxworks and *-*-netware* matches NetWare.
+
 Sun Feb 12 08:11:58 1995  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
-	* gdb.base/callfuncs.exp: Add tests for passing floats, chars, and
-	shorts where there are ANSI-style function definitions.
+	* gdb.base/{callfuncs.exp,callfuncs.c}: Add tests for passing
+	floats, chars, and shorts where there are ANSI-style function
+	definitions.
 
 	* gdb.base/langs.exp, gdb.base/langs*: New test.
 	* gdb.base/Makefile.in: Build it.
diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index 535d38a54a..1a10cd4117 100644
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -24,16 +24,16 @@ target_makefile_frag=config/mt-unix
 
 	# this section is for all targets
 case "${target}" in
-       i[345]86-*-aout) target_makefile_frag=config/mt-i386-aout ;;
-       *-*-lynx)       target_makefile_frag=config/mt-lynx ;;
-       *-*-netware)    target_makefile_frag=config/mt-netware ;;
-       *-*-vxworks)    target_makefile_frag=config/mt-vxworks ;;
-       m68k-*-*)       target_makefile_frag=config/mt-m68k ;;
-       i960-*-nindy)   target_makefile_frag=config/mt-i960-nindy ;;
-       a29k-*-udi)     target_makefile_frag=config/mt-a29k-udi ;;
-       sparclite-*-*)  target_makefile_frag=config/mt-slite ;;
-       sparc-*-aout)   target_makefile_frag=config/mt-sparc-aout ;;
-       mips-*-ecoff)   target_makefile_frag=config/mt-mips-ecoff ;;
+	i[345]86-*-aout)	target_makefile_frag=config/mt-i386-aout ;;
+	*-*-lynx)	target_makefile_frag=config/mt-lynx ;;
+	*-*-netware)	target_makefile_frag=config/mt-netware ;;
+	*-*-vxworks*)	target_makefile_frag=config/mt-vxworks ;;
+	m68k-*-*)	target_makefile_frag=config/mt-m68k ;;
+	i960-*-nindy)	target_makefile_frag=config/mt-i960-nindy ;;
+	a29k-*-udi)	target_makefile_frag=config/mt-a29k-udi ;;
+	sparclite-*-*)	target_makefile_frag=config/mt-slite ;;
+	sparc-*-aout)	target_makefile_frag=config/mt-sparc-aout ;;
+	mips-*-ecoff)	target_makefile_frag=config/mt-mips-ecoff ;;
 esac
 
 case "${target}" in
diff --git a/gdb/testsuite/gdb.base/configure.in b/gdb/testsuite/gdb.base/configure.in
index a18dec0a02..fed5736613 100644
--- a/gdb/testsuite/gdb.base/configure.in
+++ b/gdb/testsuite/gdb.base/configure.in
@@ -16,17 +16,17 @@ target_makefile_frag=../config/mt-unix
 
 	# this section is for all targets
 case "${target}" in
-       hppa*-*-hpux*)  target_makefile_frag=../config/mt-hpux ;;
-       i[345]86-*-aout) target_makefile_frag=../config/mt-i386-aout ;;
-       i[345]86-*-netware) target_makefile_frag=../config/mt-i386-netware ;;
-       *-*-lynx)       target_makefile_frag=../config/mt-lynx ;;
-       *-*-vxworks)    target_makefile_frag=../config/mt-vxworks ;;
-       m68k-*-*)       target_makefile_frag=../config/mt-m68k ;;
-       i960-*-nindy)   target_makefile_frag=../config/mt-i960-nindy ;;
-       a29k-*-udi)     target_makefile_frag=../config/mt-a29k-udi ;;
-       sparclite-*-*)  target_makefile_frag=../config/mt-slite ;;
-       sparc-*-aout)   target_makefile_frag=../config/mt-sparc-aout ;;
-       mips-*-ecoff)   target_makefile_frag=../config/mt-mips-ecoff ;;
+	hppa*-*-hpux*)	target_makefile_frag=../config/mt-hpux ;;
+	i[345]86-*-aout)	target_makefile_frag=../config/mt-i386-aout ;;
+	*-*-lynx)	target_makefile_frag=../config/mt-lynx ;;
+	*-*-netware*)	target_makefile_frag=../config/mt-netware ;;
+	*-*-vxworks*)	target_makefile_frag=../config/mt-vxworks ;;
+	m68k-*-*)	target_makefile_frag=../config/mt-m68k ;;
+	i960-*-nindy)	target_makefile_frag=../config/mt-i960-nindy ;;
+	a29k-*-udi)	target_makefile_frag=../config/mt-a29k-udi ;;
+	sparclite-*-*)	target_makefile_frag=../config/mt-slite ;;
+	sparc-*-aout)	target_makefile_frag=../config/mt-sparc-aout ;;
+	mips-*-ecoff)	target_makefile_frag=../config/mt-mips-ecoff ;;
 esac
 
 # post-target:
diff --git a/gdb/testsuite/gdb.chill/configure.in b/gdb/testsuite/gdb.chill/configure.in
index 003bef62a9..affcf0745e 100644
--- a/gdb/testsuite/gdb.chill/configure.in
+++ b/gdb/testsuite/gdb.chill/configure.in
@@ -16,15 +16,16 @@ target_makefile_frag=config/mt-unix
 
 	# this section is for all targets
 case "${target}" in
-       i[345]86-*-aout) target_makefile_frag=config/mt-i386-aout ;;
-       *-*-lynx)       target_makefile_frag=config/mt-lynx ;;
-       *-*-vxworks)    target_makefile_frag=config/mt-vxworks ;;
-       m68k-*-*)       target_makefile_frag=config/mt-m68k ;;
-       i960-*-nindy)   target_makefile_frag=config/mt-i960-nindy ;;
-       a29k-*-udi)     target_makefile_frag=config/mt-a29k-udi ;;
-       sparclite-*-*)  target_makefile_frag=config/mt-slite ;;
-       sparc-*-aout)   target_makefile_frag=config/mt-sparc-aout ;;
-       mips-*-ecoff)   target_makefile_frag=config/mt-mips-ecoff ;;
+	i[345]86-*-aout)	target_makefile_frag=../config/mt-i386-aout ;;
+	*-*-lynx)       target_makefile_frag=../config/mt-lynx ;;
+	*-*-netware*)	target_makefile_frag=../config/mt-netware ;;
+	*-*-vxworks*)	target_makefile_frag=../config/mt-vxworks ;;
+	m68k-*-*)	target_makefile_frag=../config/mt-m68k ;;
+	i960-*-nindy)	target_makefile_frag=../config/mt-i960-nindy ;;
+	a29k-*-udi)	target_makefile_frag=../config/mt-a29k-udi ;;
+	sparclite-*-*)	target_makefile_frag=../config/mt-slite ;;
+	sparc-*-aout)	target_makefile_frag=../config/mt-sparc-aout ;;
+	mips-*-ecoff)	target_makefile_frag=../config/mt-mips-ecoff ;;
 esac
 
 # post-target: