From owner-svn-src-all@FreeBSD.ORG  Wed Oct 10 14:47:47 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 7AFC9AFC;
 Wed, 10 Oct 2012 14:47:47 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 635788FC14;
 Wed, 10 Oct 2012 14:47:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9AEllnL047183;
 Wed, 10 Oct 2012 14:47:47 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9AEllVK047181;
 Wed, 10 Oct 2012 14:47:47 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201210101447.q9AEllVK047181@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Wed, 10 Oct 2012 14:47:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r241395 - 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.14
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: Wed, 10 Oct 2012 14:47:47 -0000

Author: jhb
Date: Wed Oct 10 14:47:46 2012
New Revision: 241395
URL: http://svn.freebsd.org/changeset/base/241395

Log:
  - Fix the error message when a dependency string is not provided to
    reference a missing dependency rather than a missing compile command.
  - Don't append a newline to the auto-generated compile command.  The
    compile command has a newline appended when it is later output to the
    Makefile.
  
  MFC after:	2 weeks

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

Modified: head/usr.sbin/config/mkmakefile.c
==============================================================================
--- head/usr.sbin/config/mkmakefile.c	Wed Oct 10 08:36:38 2012	(r241394)
+++ head/usr.sbin/config/mkmakefile.c	Wed Oct 10 14:47:46 2012	(r241395)
@@ -431,7 +431,7 @@ nextparam:
 		next_quoted_word(fp, wd);
 		if (wd == 0) {
 			fprintf(stderr,
-			    "%s: %s missing compile command string.\n",
+			    "%s: %s missing dependency string.\n",
 			    fname, this);
 			exit(1);
 		}
@@ -762,7 +762,7 @@ do_rules(FILE *f)
 				break;
 			}
 			snprintf(cmd, sizeof(cmd),
-			    "${%s_%c%s}\n", ftype,
+			    "${%s_%c%s}", ftype,
 			    toupper(och),
 			    ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
 			compilewith = cmd;