* Makefile.in (version.c), main.c (print_gdb_version): Use

	host_alias and target_alias, not host_canonical and
	target_canonical, to print configuration.

3 files changed, 13 insertions, 7 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7bfbdfc..d5b5006 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 27 15:12:23 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+	* Makefile.in (version.c), main.c (print_gdb_version): Use
+	host_alias and target_alias, not host_canonical and
+	target_canonical, to print configuration.
+
 Wed Jan 26 10:57:21 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
 	* parse.c (write_exp_msymbol): Use new type msymbol_addr_type instead
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index fdae89e..d8cb06e 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -775,8 +775,8 @@ copying.c: COPYING copying.awk
 
 version.c: Makefile
 	echo 'char *version = "$(VERSION)";' >version.c
-	echo 'char *host_canonical = "$(host_canonical)";' >> version.c
-	echo 'char *target_canonical = "$(target_canonical)";' >> version.c
+	echo 'char *host_name = "$(host_alias)";' >> version.c
+	echo 'char *target_name = "$(target_alias)";' >> version.c
 
 # c-exp.tab.c is generated in objdir from c-exp.y if it doesn't exist
 # in srcdir, then compiled in objdir to c-exp.tab.o.
diff --git a/gdb/main.c b/gdb/main.c
index 8270f12..0a6090e 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -180,11 +180,11 @@ extern char *version;
 
 /* Canonical host name as a string. */
 
-extern char *host_canonical;
+extern char *host_name;
 
 /* Canonical target name as a string. */
 
-extern char *target_canonical;
+extern char *target_name;
 
 extern char lang_frame_mismatch_warn[];		/* language.c */
 
@@ -2183,10 +2183,10 @@ print_gdb_version (stream)
   GDB_FILE *stream;
 {
   fprintf_filtered (stream, "\
-GDB %s (%s", version, host_canonical);
+GDB %s (%s", version, host_name);
 
-  if (strcmp(host_canonical, target_canonical))
-    fprintf_filtered (stream, " --target %s", target_canonical);
+  if (!STREQ (host_name, target_name))
+    fprintf_filtered (stream, " --target %s", target_name);
 
   fprintf_filtered (stream, "), ");
   wrap_here("");