From 50e080fe0eee4bbbe5abcf8a94f21cc2d90f1482 Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Fri, 15 Mar 2002 11:21:57 +0000 Subject: [PATCH] Don't use temporary file to generate makedevs.c -- it's okay to write to makedevs.c directly as it's not protected by the .PRECIOUS attribute. --- usr.sbin/sade/Makefile | 40 +++++++++++++++++------------------- usr.sbin/sysinstall/Makefile | 40 +++++++++++++++++------------------- 2 files changed, 38 insertions(+), 42 deletions(-) diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index f8935089a60..f5074e3f53f 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -22,51 +22,49 @@ CLEANFILES= makedevs.c rtermcap rtermcap.tmp dumpnlist CLEANFILES+= keymap.tmp keymap.h makedevs.c: Makefile rtermcap - rm -f makedevs.tmp - echo '#include ' > makedevs.tmp + echo '#include ' > makedevs.c ./rtermcap ansi | \ file2c 'const char termcap_ansi[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25w | \ file2c 'const char termcap_cons25w[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25 | \ file2c 'const char termcap_cons25[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25-m | \ file2c 'const char termcap_cons25_m[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25r | \ file2c 'const char termcap_cons25r[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25r-m | \ file2c 'const char termcap_cons25r_m[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25l1 | \ file2c 'const char termcap_cons25l1[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25l1-m | \ file2c 'const char termcap_cons25l1_m[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap xterm | \ file2c 'const char termcap_xterm[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c .if ${MACHINE} == "i386" - file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp - echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp - file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp - echo "size_t mbr_size = sizeof(mbr);" >> makedevs.tmp + file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.c + echo "size_t boot0_size = sizeof(boot0);" >> makedevs.c + file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.c + echo "size_t mbr_size = sizeof(mbr);" >> makedevs.c .endif .if ${MACHINE} == "pc98" - file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp - echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp - file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.tmp - echo "size_t boot05_size = sizeof(boot05);" >> makedevs.tmp + file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.c + echo "size_t boot0_size = sizeof(boot0);" >> makedevs.c + file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.c + echo "size_t boot05_size = sizeof(boot05);" >> makedevs.c .endif - mv makedevs.tmp makedevs.c build-tools: rtermcap diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index f8935089a60..f5074e3f53f 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -22,51 +22,49 @@ CLEANFILES= makedevs.c rtermcap rtermcap.tmp dumpnlist CLEANFILES+= keymap.tmp keymap.h makedevs.c: Makefile rtermcap - rm -f makedevs.tmp - echo '#include ' > makedevs.tmp + echo '#include ' > makedevs.c ./rtermcap ansi | \ file2c 'const char termcap_ansi[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25w | \ file2c 'const char termcap_cons25w[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25 | \ file2c 'const char termcap_cons25[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25-m | \ file2c 'const char termcap_cons25_m[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25r | \ file2c 'const char termcap_cons25r[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25r-m | \ file2c 'const char termcap_cons25r_m[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25l1 | \ file2c 'const char termcap_cons25l1[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap cons25l1-m | \ file2c 'const char termcap_cons25l1_m[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap vt100 | \ file2c 'const char termcap_vt100[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c ./rtermcap xterm | \ file2c 'const char termcap_xterm[] = {' ',0};' \ - >> makedevs.tmp + >> makedevs.c .if ${MACHINE} == "i386" - file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp - echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp - file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.tmp - echo "size_t mbr_size = sizeof(mbr);" >> makedevs.tmp + file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.c + echo "size_t boot0_size = sizeof(boot0);" >> makedevs.c + file2c 'u_char mbr[] = {' '};' < /boot/mbr >> makedevs.c + echo "size_t mbr_size = sizeof(mbr);" >> makedevs.c .endif .if ${MACHINE} == "pc98" - file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.tmp - echo "size_t boot0_size = sizeof(boot0);" >> makedevs.tmp - file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.tmp - echo "size_t boot05_size = sizeof(boot05);" >> makedevs.tmp + file2c 'u_char boot0[] = {' '};' < /boot/boot0 >> makedevs.c + echo "size_t boot0_size = sizeof(boot0);" >> makedevs.c + file2c 'u_char boot05[] = {' '};' < /boot/boot0.5 >> makedevs.c + echo "size_t boot05_size = sizeof(boot05);" >> makedevs.c .endif - mv makedevs.tmp makedevs.c build-tools: rtermcap