Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/common Tweak MAKEDEVSPEC target to properly report M...
details: https://anonhg.NetBSD.org/src/rev/240cb2d7a7df
branches: trunk
changeset: 777429:240cb2d7a7df
user: njoly <njoly%NetBSD.org@localhost>
date: Sat Feb 18 14:26:27 2012 +0000
description:
Tweak MAKEDEVSPEC target to properly report MAKEDEV failures:
- No need to ignore `rm -f' failures which should not happen.
- Do not pipe MAKEDEV output, but use a temp file.
diffstat:
distrib/common/Makefile.makedev | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (26 lines):
diff -r aab7b313e820 -r 240cb2d7a7df distrib/common/Makefile.makedev
--- a/distrib/common/Makefile.makedev Sat Feb 18 13:51:29 2012 +0000
+++ b/distrib/common/Makefile.makedev Sat Feb 18 14:26:27 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.makedev,v 1.15 2008/10/25 22:27:34 apb Exp $
+# $NetBSD: Makefile.makedev,v 1.16 2012/02/18 14:26:27 njoly Exp $
#
# Makefile snippet to add ${MAKEDEVTARGETS} devices to the mtree list
# (if set), otherwise copy .OBJDIR-of-etc/MAKEDEV to ./dev
@@ -43,12 +43,12 @@
${MAKEDEVSPEC}: ${MAKEDEVSCRIPT}
${_MKTARGET_CREATE}
- -rm -f ${.TARGET} ${.TARGET}.tmp
+ rm -f ${.TARGET} ${.TARGET}.tmp
MACHINE=${MACHINE:Q} MACHINE_ARCH=${MACHINE_ARCH:Q} \
${HOST_SH} ${MAKEDEVSCRIPT} -s ${MAKEDEVTARGETS} \
- | ${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' \
- > ${.TARGET}.tmp \
- && sort -o ${.TARGET} ${.TARGET}.tmp
+ > ${.TARGET}.tmp
+ ${TOOL_SED} -e '/^\. type=dir/d' -e 's,^\.,./dev,' ${.TARGET}.tmp \
+ | sort -o ${.TARGET}
.else # ! MAKEDEVTARGETS
Home |
Main Index |
Thread Index |
Old Index