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

John Baldwin jhb at FreeBSD.org
Wed Oct 10 14:47:47 UTC 2012


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;


More information about the svn-src-all mailing list