From e7d24931fe70d8fdd4899c7c9f9cc97698d06c6a Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Fri, 30 Aug 1996 04:07:04 +0000
Subject: [PATCH] cmp -s || install -c --> install -C

---
 eBones/include/Makefile       | 10 +++++-----
 eBones/lib/libkadm/Makefile   | 14 +++++---------
 eBones/lib/libkrb/Makefile    |  6 ++----
 eBones/lib/librkinit/Makefile |  4 +---
 secure/lib/libdes/Makefile    | 10 +++++-----
 5 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/eBones/include/Makefile b/eBones/include/Makefile
index 95bf8bcdc07f..d4293c96a846 100644
--- a/eBones/include/Makefile
+++ b/eBones/include/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.7 1996/07/30 21:15:58 markm Exp $
 
 FILES=	kparse.h krb.h krb_db.h
 
@@ -10,9 +10,9 @@ CFLAGS+=	KERBEROS
 all include clean cleandir depend lint tags:
 
 beforeinstall:
-	-cd ${.CURDIR}; for file in ${FILES}; do \
-		cmp -s $$file ${DESTDIR}/usr/include/kerberosIV/$$file || \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$file \
-		${DESTDIR}/usr/include/kerberosIV; done
+.for i in ${FILES}
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/$i \
+		${DESTDIR}/usr/include/kerberosIV/$i
+.endfor
 
 .include <bsd.prog.mk>
diff --git a/eBones/lib/libkadm/Makefile b/eBones/lib/libkadm/Makefile
index de3a22590266..8a6d97e55442 100644
--- a/eBones/lib/libkadm/Makefile
+++ b/eBones/lib/libkadm/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id$
+#	$Id: Makefile,v 1.11 1996/07/30 21:16:12 markm Exp $
 
 LIB=	kadm
 
@@ -7,14 +7,10 @@ SRCS=	kadm_err.c kadm_stream.c kadm_supp.c kadm_cli_wrap.c
 CFLAGS+=	-I. -I${.CURDIR} -I${KRBOBJDIR} -DPOSIX -DKERBEROS
 
 beforeinstall: kadm_err.c
-	-cd ${.CURDIR}; cmp -s kadm.h \
-	    ${DESTDIR}/usr/include/kerberosIV/kadm.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm.h \
-	    ${DESTDIR}/usr/include/kerberosIV
-	-cd ${.OBJDIR}; cmp -s kadm_err.h \
-	    ${DESTDIR}/usr/include/kerberosIV/kadm_err.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 kadm_err.h \
-	    ${DESTDIR}/usr/include/kerberosIV
+.for i in kadm.h kadm_err.h
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/$i \
+	    ${DESTDIR}/usr/include/kerberosIV/$i
+.endfor
 
 .include <bsd.lib.mk>
 
diff --git a/eBones/lib/libkrb/Makefile b/eBones/lib/libkrb/Makefile
index a78f0dd93e97..d898efdef56a 100644
--- a/eBones/lib/libkrb/Makefile
+++ b/eBones/lib/libkrb/Makefile
@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.1 (Berkeley) 6/25/90
-#	$Id: Makefile,v 1.12 1995/11/12 08:13:21 markm Exp $
+#	$Id: Makefile,v 1.13 1996/06/24 04:22:27 jkh Exp $
 
 LIB=	krb
 SHLIB_MINOR=   1
@@ -21,9 +21,7 @@ SRCS=	krb_err.c create_auth_reply.c create_ciph.c \
 LDADD+=	-lcom_err
 
 beforeinstall: krb_err.c
-	-cd ${.OBJDIR}; cmp -s krb_err.h \
-	    ${DESTDIR}/usr/include/kerberosIV/krb_err.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 krb_err.h \
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 krb_err.h \
 	    ${DESTDIR}/usr/include/kerberosIV
 
 MAN3=	krb.3 krb_realmofhost.3 krb_sendauth.3 krb_set_tkt_string.3 \
diff --git a/eBones/lib/librkinit/Makefile b/eBones/lib/librkinit/Makefile
index 29ee4401b597..3521599e1045 100644
--- a/eBones/lib/librkinit/Makefile
+++ b/eBones/lib/librkinit/Makefile
@@ -7,9 +7,7 @@ SRCS=	rkinit_err.c rk_lib.c rk_rpc.c rk_util.c rk_krb.c
 LDADD+=	-lcom_err
 
 beforeinstall:
-	-cd ${.OBJDIR}; cmp -s rkinit_err.h \
-	    ${DESTDIR}/usr/include/kerberosIV/rkinit_err.h || \
-	    install -c -o ${BINOWN} -g ${BINGRP} -m 444 rkinit_err.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 rkinit_err.h \
 	    ${DESTDIR}/usr/include/kerberosIV
 
 MAN3=	rkinit.3
diff --git a/secure/lib/libdes/Makefile b/secure/lib/libdes/Makefile
index df0f451b50a5..f32c85ebf31d 100644
--- a/secure/lib/libdes/Makefile
+++ b/secure/lib/libdes/Makefile
@@ -1,5 +1,5 @@
 #	@(#)Makefile	5.4 (Berkeley) 5/7/91
-#	$Id: Makefile,v 1.2 1996/07/27 22:16:19 jkh Exp $
+#	$Id: Makefile,v 1.3 1996/07/29 18:01:39 markm Exp $
 
 LIB=	des
 SRCS=	cbc3_enc.c cbc_cksm.c cbc_enc.c  cfb64enc.c cfb_enc.c  \
@@ -33,9 +33,9 @@ MLINKS= des_crypt.3 des_read_password.3 \
 	des_crypt.3 des_set_odd_parity.3 des_crypt.3 des_is_weak_key.3
 
 beforeinstall:
-	-cd ${.CURDIR}; for file in ${HEADER}; do \
-		cmp -s $$file ${DESTDIR}/usr/include/$$file || \
-		install -c -o ${BINOWN} -g ${BINGRP} -m 444 $$file \
-		${DESTDIR}/usr/include; done
+.for i in ${HEADER}
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/$i \
+		${DESTDIR}/usr/include
+.endfor
 
 .include <bsd.lib.mk>