[src/netbsd-1-6]: src/usr.sbin/amd/include Pull up revision 1.21 (requested b...

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65020ccb268d
branches:  netbsd-1-6
changeset: 527622:65020ccb268d
user:      tv <tv%NetBSD.org@localhost>
date:      Thu May 30 18:44:25 2002 +0000

description:
Pull up revision 1.21 (requested by itojun in ticket #75):
embed correct machine/machine_arch info into binary.  PR 17103.
(fixes 1.18 -> 1.19 change)
From: Takeshi Nakayama <tn%catvmics.ne.jp@localhost>

diffstat:

 usr.sbin/amd/include/config.h |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r 08ea8ed1c06c -r 65020ccb268d usr.sbin/amd/include/config.h
--- a/usr.sbin/amd/include/config.h     Thu May 30 18:38:30 2002 +0000
+++ b/usr.sbin/amd/include/config.h     Thu May 30 18:44:25 2002 +0000
@@ -882,14 +882,18 @@
 #define VERSION "6.0.6"
 
 /* Define name of host machine's cpu (eg. sparc) */
-#define HOST_CPU "i386"
+#define HOST_CPU MACHINE
 
 /* Define name of host machine's architecture (eg. sun4) */
-#define HOST_ARCH "i386"
+#define HOST_ARCH MACHINE_ARCH
 
 /* Define name of host machine's vendor (eg. sun) */
 #define HOST_VENDOR "unknown"
 
+/* We pick some parameters from our local config file */
+#include <config_local.h>
+
+#if 0
 /* Define name and version of host machine (eg. solaris2.5.1) */
 #define HOST_OS "netbsdelf1.5V"
 
@@ -910,6 +914,7 @@
 
 /* Define configuration date */
 #define CONFIG_DATE "Sun May 13 16:00:07 CEST 2001"
+#endif
 
 /* what type of network transport type is in use?  TLI or sockets? */
 /* #undef HAVE_TRANSPORT_TYPE_TLI */