svn commit: r218544 - head/usr.sbin/config

[Warner Losh]

Author: imp
Date: Fri Feb 11 06:35:53 2011
New Revision: 218544
URL: http://svn.freebsd.org/changeset/base/218544

Log:
  Generate MACHINE= and MACHINE_ARCH= lines based on the machine
  directive.  Once this is MFC'd, we can move these out of the template
  files where they are (incosnsitently) defined.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/config/configvers.h
  head/usr.sbin/config/mkmakefile.c

Modified: head/usr.sbin/config/configvers.h
==============================================================================
--- head/usr.sbin/config/configvers.h	Fri Feb 11 05:57:33 2011	(r218543)
+++ head/usr.sbin/config/configvers.h	Fri Feb 11 06:35:53 2011	(r218544)
@@ -49,5 +49,5 @@
  *
  * $FreeBSD$
  */
-#define	CONFIGVERS	600011
+#define	CONFIGVERS	600012
 #define	MAJOR_VERS(x)	((x) / 100000)

Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c	Fri Feb 11 05:57:33 2011	(r218543)
+++ head/usr.sbin/config/mkmakefile.c	Fri Feb 11 06:35:53 2011	(r218544)
@@ -140,6 +140,8 @@ makefile(void)
 	if (ofp == 0)
 		err(1, "%s", path("Makefile.new"));
 	fprintf(ofp, "KERN_IDENT=%s\n", ident);
+	fprintf(ofp, "MACHINE=%s\n", machinename);
+	fprintf(ofp, "MACHINE_ARCH=%s\n", machinearch);
 	SLIST_FOREACH_SAFE(op, &mkopt, op_next, t) {
 		fprintf(ofp, "%s=%s", op->op_name, op->op_value);
 		while ((op = SLIST_NEXT(op, op_append)) != NULL)