From owner-svn-src-all@FreeBSD.ORG  Mon Feb  3 19:10:33 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9CA631A4;
 Mon,  3 Feb 2014 19:10:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 897FD1984;
 Mon,  3 Feb 2014 19:10:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s13JAXii017007;
 Mon, 3 Feb 2014 19:10:33 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s13JAXLG017006;
 Mon, 3 Feb 2014 19:10:33 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <201402031910.s13JAXLG017006@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 3 Feb 2014 19:10:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r261445 - head/usr.sbin/config
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
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/options/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: Mon, 03 Feb 2014 19:10:33 -0000

Author: imp
Date: Mon Feb  3 19:10:33 2014
New Revision: 261445
URL: http://svnweb.freebsd.org/changeset/base/261445

Log:
  Fix a bug introduced in r261437 that failed to honor "optional
  profiling-routine" to work, since profiling-routine is not really an
  option or a device, but a special case elsewhere in the code.

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

Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c	Mon Feb  3 18:56:41 2014	(r261444)
+++ head/usr.sbin/config/mkmakefile.c	Mon Feb  3 19:10:33 2014	(r261445)
@@ -477,18 +477,19 @@ nextparam:
 		filetype = NODEPEND;
 		goto nextparam;
 	}
-	if (eq(wd, "profiling-routine")) {
-		filetype = PROFILING;
-		goto nextparam;
-	}
 	if (eq(wd, "nowerror")) {
 		nowerror = 1;
 		goto nextparam;
 	}
+	nreqs++;
+	/* Hack to allow "optional profiling-routine" to work */
+	if (eq(wd, "profiling-routine")) {
+		filetype = PROFILING;
+		goto nextparam;
+	}
 	if (std)
 		errout("standard entry %s has optional inclusion specifier %s!\n",
 		    this, wd);
-	nreqs++;
 	STAILQ_FOREACH(dp, &dtab, d_next)
 		if (eq(dp->d_name, wd)) {
 			dp->d_done |= DEVDONE;