From owner-svn-src-all@FreeBSD.ORG  Fri Feb 11 06:35:53 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3FAD106564A;
	Fri, 11 Feb 2011 06:35:53 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C23F18FC16;
	Fri, 11 Feb 2011 06:35:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1B6Zra4048659;
	Fri, 11 Feb 2011 06:35:53 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1B6ZrfQ048656;
	Fri, 11 Feb 2011 06:35:53 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201102110635.p1B6ZrfQ048656@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 11 Feb 2011 06:35:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218544 - head/usr.sbin/config
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Feb 2011 06:35:53 -0000

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)