summaryrefslogtreecommitdiffstats
path: root/usr.sbin/config
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-10-10 14:47:46 +0000
committerjhb <jhb@FreeBSD.org>2012-10-10 14:47:46 +0000
commit5c4def7e52cb93ab11267b6ecfa9a57f7fea2e66 (patch)
treea938ea6e5ab771970b48ebb019989d4a433b14b5 /usr.sbin/config
parentceb08698f2ab235d37571dd8489ae8313efcbfb7 (diff)
downloadFreeBSD-src-5c4def7e52cb93ab11267b6ecfa9a57f7fea2e66.zip
FreeBSD-src-5c4def7e52cb93ab11267b6ecfa9a57f7fea2e66.tar.gz
- 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
Diffstat (limited to 'usr.sbin/config')
-rw-r--r--usr.sbin/config/mkmakefile.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/config/mkmakefile.c b/usr.sbin/config/mkmakefile.c
index 8a7f55a..324ad3b 100644
--- a/usr.sbin/config/mkmakefile.c
+++ b/usr.sbin/config/mkmakefile.c
@@ -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;
OpenPOWER on IntegriCloud