diff options
| author | rillig <rillig@NetBSD.org> | 2022-02-09 20:52:06 +0000 |
|---|---|---|
| committer | rillig <rillig@NetBSD.org> | 2022-02-09 20:52:06 +0000 |
| commit | dee2a5add0f0cf196c7cc2d10e4d4e55e6d72a69 (patch) | |
| tree | 9c01691c4d41a0ef34fcac413d43b80f3dee2779 /usr.bin/make | |
| parent | 8ffc5d07deb270e1f1579b32703f121273f04ab5 (diff) | |
make: prefix the warning about read-only .OBJDIR with a colon
For consistency with the other warnings.
Diffstat (limited to 'usr.bin/make')
| -rw-r--r-- | usr.bin/make/main.c | 6 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/Makefile | 3 | ||||
| -rw-r--r-- | usr.bin/make/unit-tests/objdir-writable.exp | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c index 19671fb5795..dfc9be9d18a 100644 --- a/usr.bin/make/main.c +++ b/usr.bin/make/main.c @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.577 2022/01/29 09:38:26 rillig Exp $ */ +/* $NetBSD: main.c,v 1.578 2022/02/09 20:52:06 rillig Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1993 @@ -111,7 +111,7 @@ #include "trace.h" /* "@(#)main.c 8.3 (Berkeley) 3/19/94" */ -MAKE_RCSID("$NetBSD: main.c,v 1.577 2022/01/29 09:38:26 rillig Exp $"); +MAKE_RCSID("$NetBSD: main.c,v 1.578 2022/02/09 20:52:06 rillig Exp $"); #if defined(MAKE_NATIVE) && !defined(lint) __COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 " "The Regents of the University of California. " @@ -718,7 +718,7 @@ Main_SetObjdir(bool writable, const char *fmt, ...) return false; if ((writable && access(path, W_OK) != 0) || chdir(path) != 0) { - (void)fprintf(stderr, "%s warning: %s: %s.\n", + (void)fprintf(stderr, "%s: warning: %s: %s.\n", progname, path, strerror(errno)); return false; } diff --git a/usr.bin/make/unit-tests/Makefile b/usr.bin/make/unit-tests/Makefile index 46c8a72ed58..9c23e531488 100644 --- a/usr.bin/make/unit-tests/Makefile +++ b/usr.bin/make/unit-tests/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.304 2022/02/09 18:54:19 rillig Exp $ +# $NetBSD: Makefile,v 1.305 2022/02/09 20:52:06 rillig Exp $ # # Unit tests for make(1) # @@ -688,7 +688,6 @@ LIMIT_RESOURCES?= : # always pretend .MAKE was called 'make' _SED_CMDS+= -e 's,^${TEST_MAKE:T:S,.,\\.,g}[][0-9]*:,make:,' _SED_CMDS+= -e 's,${TEST_MAKE:S,.,\\.,g},make,' -_SED_CMDS+= -e 's,${TEST_MAKE:T:S,.,\\.,g}[][0-9]* warning,make warning,' _SED_CMDS+= -e 's,^usage: ${TEST_MAKE:T:S,.,\\.,g} ,usage: make ,' # replace anything after 'stopped in' with unit-tests _SED_CMDS+= -e '/stopped/s, /.*, unit-tests,' diff --git a/usr.bin/make/unit-tests/objdir-writable.exp b/usr.bin/make/unit-tests/objdir-writable.exp index 9563b8b0701..dc5cd706349 100644 --- a/usr.bin/make/unit-tests/objdir-writable.exp +++ b/usr.bin/make/unit-tests/objdir-writable.exp @@ -1,4 +1,4 @@ -make warning: <tmpdir>/roobj: Permission denied. +make: warning: <tmpdir>/roobj: Permission denied. <tmpdir> <tmpdir>/roobj <tmpdir>/roobj |
