cmp -s || install -c ==> install -C

5 files changed, 13 insertions, 18 deletions

diff --git a/lib/libc_r/stdio/Makefile.inc b/lib/libc_r/stdio/Makefile.inc
index c534a5c..d63e196 100644
--- a/lib/libc_r/stdio/Makefile.inc
+++ b/lib/libc_r/stdio/Makefile.inc
@@ -3,13 +3,13 @@
 # stdio sources
 .PATH: ${.CURDIR}/../libc/stdio
 
-SRCS+=	clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \
-	fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \
+SRCS+=	asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c \
+	fgetc.c fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \
 	fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
 	fseek.c fsetpos.c ftell.c funopen.c fvwrite.c fwalk.c fwrite.c \
 	getc.c getchar.c gets.c getw.c makebuf.c mktemp.c perror.c \
 	printf.c putc.c putchar.c puts.c putw.c refill.c remove.c rewind.c \
 	rget.c scanf.c setbuf.c setbuffer.c setvbuf.c snprintf.c sprintf.c \
-	sscanf.c stdio.c tempnam.c tmpfile.c tmpnam.c ungetc.c vfprintf.c \
-	vfscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c \
-	wbuf.c wsetup.c
+	sscanf.c stdio.c tempnam.c tmpfile.c tmpnam.c ungetc.c vasprintf.c \
+	vfprintf.c vfscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c \
+	vsscanf.c wbuf.c wsetup.c
diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile
index c295a3a..2b1a9c5 100644
--- a/lib/libcom_err/Makefile
+++ b/lib/libcom_err/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.1.1.1 1995/01/14 22:23:41 wollman Exp $
+#	$Id: Makefile,v 1.2 1995/08/06 12:23:28 bde Exp $
 
 LIB=	com_err
 SRCS=	com_err.c error_message.c et_name.c init_et.c
@@ -8,8 +8,7 @@ MAN3=	com_err.3
 SUBDIR=	doc
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s com_err.h ${DESTDIR}/usr/include/com_err.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 com_err.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/com_err.h \
 	    ${DESTDIR}/usr/include
 
 .include <bsd.lib.mk>
diff --git a/lib/libcurses/Makefile b/lib/libcurses/Makefile
index 902e59d..ec3aad1 100644
--- a/lib/libcurses/Makefile
+++ b/lib/libcurses/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 1/2/94
-#	$Id: Makefile,v 1.5 1995/03/19 21:47:42 nate Exp $
+#	$Id: Makefile,v 1.6 1995/08/06 12:23:33 bde Exp $
 
 CFLAGS+=#-DTFILE=\"/dev/ttyp0\"
 CFLAGS+=-D_CURSES_PRIVATE -I${.CURDIR}
@@ -15,8 +15,7 @@ SRCS=	addbytes.c addch.c addnstr.c box.c clear.c clrtobot.c clrtoeol.c \
 MAN3=	curses.3
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/curses.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 curses.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/curses.h \
 	    ${DESTDIR}/usr/include
 
 .include <bsd.lib.mk>
diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile
index 7928c11..44b47d1 100644
--- a/lib/libdisk/Makefile
+++ b/lib/libdisk/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.15 1996/05/07 23:18:43 wosch Exp $
+#	$Id: Makefile,v 1.16 1996/06/23 13:11:51 bde Exp $
 
 LIB=	disk
 SRCS=	blocks.c disklabel.c dkcksum.c chunk.c disk.c change.c \
@@ -51,10 +51,7 @@ data.c:	${.CURDIR}/libdisk.h ${BOOTS}/boot1 ${BOOTS}/boot2
 	mv -f tmp.c data.c
 
 beforeinstall:
-	@${ECHO} installing libdisk.h
-	@cd ${.CURDIR}; \
-	cmp -s libdisk.h ${DESTDIR}/usr/include/libdisk.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 libdisk.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/libdisk.h \
 	    ${DESTDIR}/usr/include/libdisk.h
 
 
diff --git a/lib/libftpio/Makefile b/lib/libftpio/Makefile
index d7254d3..79d270e 100644
--- a/lib/libftpio/Makefile
+++ b/lib/libftpio/Makefile
@@ -5,8 +5,8 @@ MAN3=		ftpio.3
 CLEANFILES+=	ftperr.c
 
 beforeinstall:
-	cd ${.CURDIR}; cmp -s ftpio.h ${DESTDIR}/usr/include/ftpio.h || \
-	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ftpio.h ${DESTDIR}/usr/include
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/ftpio.h \
+		${DESTDIR}/usr/include
 
 ftperr.c:	ftp.errors
 	@echo '#include <stdio.h>' > ${.TARGET}