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

13 files changed, 43 insertions, 70 deletions

diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile
index 507977a..599332e 100644
--- a/gnu/lib/libdialog/Makefile
+++ b/gnu/lib/libdialog/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libdialog
-# $Id: Makefile,v 1.16 1996/02/09 16:19:16 mpp Exp $
+# $Id: Makefile,v 1.18 1996/08/13 12:46:10 jkh Exp $
 
 LIB=    dialog
 MAN3=	dialog.3
@@ -16,8 +16,7 @@ LDADD+= -lncurses -lmytinfo
 DPADD+= ${LIBNCURSES} ${LIBMYTINFO}
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s dialog.h ${DESTDIR}/usr/include/dialog.h || \
-	      ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 dialog.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/dialog.h \
 	      ${DESTDIR}/usr/include
 
 MLINKS+=dialog.3 draw_shadow.3 dialog.3 draw_box.3 \
diff --git a/gnu/lib/libg++/Makefile b/gnu/lib/libg++/Makefile
index 1bb3e5f..5b4ece6 100644
--- a/gnu/lib/libg++/Makefile
+++ b/gnu/lib/libg++/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.10 1995/07/05 15:04:47 dfr Exp $
+# $Id: Makefile,v 1.11 1995/08/06 12:22:53 bde Exp $
 #
 SRCS=	bitand.c bitany.c bitblt.c bitclear.c bitcopy.c bitcount.c \
 	bitinvert.c bitlcomp.c bitset1.c bitxor.c cleanup.c except.c \
@@ -35,11 +35,8 @@ DPADD+=	${LIBCURSES} ${LIBCOMPAT}
 
 beforeinstall:
 	cd ${.CURDIR}/include; \
-	for i in *.h; do \
-		cmp -s $$i ${DESTDIR}/usr/include/g++/$$i || \
-			${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 $$i \
-			${DESTDIR}/usr/include/g++/$$i; \
-	done
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
+		${DESTDIR}/usr/include/g++
 
 .include <bsd.lib.mk>
 .include <bsd.prog.mk>
diff --git a/gnu/lib/libg++/include/streambuf.h b/gnu/lib/libg++/include/streambuf.h
index 7a3df54..1b02d9e 100644
--- a/gnu/lib/libg++/include/streambuf.h
+++ b/gnu/lib/libg++/include/streambuf.h
@@ -247,8 +247,8 @@ class ios : public _ios_fields {
 
   protected:
     ios(streambuf* sb = 0, ostream* tie_to = 0) { init(sb, tie_to); }
-    virtual ~ios();
-    void init(streambuf* sb, ostream* tie = 0);
+    inline virtual ~ios();
+    inline void init(streambuf* sb, ostream* tie = 0);
 };
 
 #if __GNUG__==1
diff --git a/gnu/lib/libmp/Makefile b/gnu/lib/libmp/Makefile
index 4f7a474..6298f57 100644
--- a/gnu/lib/libmp/Makefile
+++ b/gnu/lib/libmp/Makefile
@@ -1,5 +1,5 @@
 # Makefile for libmp
-# $Id: Makefile,v 1.3 1995/11/13 18:39:23 markm Exp $
+# $Id: Makefile,v 1.4 1995/11/25 00:13:57 peter Exp $
 
 LIB=    mp
 SRCS=	$(MP_SRCS)
@@ -24,8 +24,7 @@ IMPL_SRCS=	memory.c mp_set_fns.c _mpz_set_str.c _mpz_get_str.c \
 beforedepend:	gmp-mparam.h mp_bases.c
 
 beforeinstall:
-	cmp -s ${.CURDIR}/../libgmp/mp.h ${DESTDIR}/usr/include/mp.h || \
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
 		${.CURDIR}/../libgmp/mp.h ${DESTDIR}/usr/include/mp.h
 
 cre-mparam: cre-mparam.c
diff --git a/gnu/lib/libregex/Makefile b/gnu/lib/libregex/Makefile
index 98c3f2d..1d59e0d 100644
--- a/gnu/lib/libregex/Makefile
+++ b/gnu/lib/libregex/Makefile
@@ -1,4 +1,4 @@
-# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.16 1996/08/12 18:03:53 ache Exp $
+# $Header: /home/ncvs/src/gnu/lib/libregex/Makefile,v 1.17 1996/08/12 19:04:23 ache Exp $
 
 
 LIB=	gnuregex
@@ -9,8 +9,7 @@ NOMAN=	noman
 SUBDIR+= doc
 
 beforeinstall:
-	cmp -s ${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h || \
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${.CURDIR}/regex.h ${DESTDIR}/usr/include/gnuregex.h
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/regex.h \
+		${DESTDIR}/usr/include/gnuregex.h
 
 .include <bsd.lib.mk>
diff --git a/lib/libmytinfo/Makefile b/lib/libmytinfo/Makefile
index a5593c2..b8247c6 100644
--- a/lib/libmytinfo/Makefile
+++ b/lib/libmytinfo/Makefile
@@ -1,7 +1,7 @@
 # Makefile for libmytinfo
 # Use 'make update_term_h' manually after changing internal
 # mytinfo structures
-# $Id: Makefile,v 1.8 1994/11/16 11:54:09 ache Exp $
+# $Id: Makefile,v 1.9 1995/08/06 12:37:26 bde Exp $
 
 LIB=    mytinfo
 SRCS=   addstr.c binorder.c buildpath.c caplist.c capsort.c compar.c\
@@ -17,15 +17,12 @@ CAPS=   1000
 
 # ${.CURDIR}/term.h: ${.CURDIR}/term.head ${.CURDIR}/term.tail
 update_term_h: ${.CURDIR}/term.head ${.CURDIR}/term.tail
-	 cat ${.CURDIR}/term.head ${.CURDIR}/term.tail > ${.CURDIR}/term.h
+	cat ${.CURDIR}/term.head ${.CURDIR}/term.tail > ${.CURDIR}/term.h
 
 beforeinstall:
-	-cmp -s ${.CURDIR}/term.h ${DESTDIR}/usr/include/term.h && \
-	 cmp -s ${.CURDIR}/term.h ${DESTDIR}/usr/include/nterm.h || \
-	  ( $(INSTALL) -c -o ${BINOWN} -g ${BINGRP} -m 444 \
-	    ${.CURDIR}/term.h ${DESTDIR}/usr/include; \
-	    rm -f ${DESTDIR}/usr/include/nterm.h; \
-	    ln -s term.h ${DESTDIR}/usr/include/nterm.h )
+	$(INSTALL) -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/term.h \
+		${DESTDIR}/usr/include
+	ln -sf term.h ${DESTDIR}/usr/include/nterm.h
 
 capsort.c: mkcapsort
 	./mkcapsort > capsort.c
diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile
index e8bb8c4..dd32bad 100644
--- a/lib/libncurses/Makefile
+++ b/lib/libncurses/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ncurses
-# $Id: Makefile,v 1.16 1996/05/27 22:58:29 wosch Exp $
+# $Id: Makefile,v 1.17 1996/08/26 09:25:20 peter Exp $
 
 LIB=    ncurses
 SHLIB_MAJOR= 3
@@ -23,13 +23,10 @@ CLEANFILES+= lib_keyname.c keys.tries
 beforedepend: keys.tries
 
 beforeinstall:
-	@cd ${.CURDIR}; for i in unctrl.h; do \
-	  cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-	  $(INSTALL) -c -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
-	  ${DESTDIR}/usr/include; done
-	@cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/ncurses.h || \
-	  $(INSTALL) -c -m 444 -o $(BINOWN) -g $(BINGRP) curses.h \
-	  ${DESTDIR}/usr/include/ncurses.h
+	${INSTALL} -C -m 444 -o $(BINOWN) -g $(BINGRP) ${.CURDIR}/unctrl.h \
+		${DESTDIR}/usr/include
+	${INSTALL} -C -m 444 -o $(BINOWN) -g $(BINGRP) ${.CURDIR}/curses.h \
+		${DESTDIR}/usr/include/ncurses.h
 
 keys.tries: ${.CURDIR}/keys.list ${.CURDIR}/MKkeys.awk
 	awk -f ${.CURDIR}/MKkeys.awk ${.CURDIR}/keys.list > keys.tries
diff --git a/lib/libscsi/Makefile b/lib/libscsi/Makefile
index b039be9..a056258 100644
--- a/lib/libscsi/Makefile
+++ b/lib/libscsi/Makefile
@@ -14,8 +14,7 @@ MLINKS+=scsi.3 scsireq_buff_decode.3 scsi.3 scsireq_build.3 \
 	scsi.3 scsi_debug_output.3
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s scsi.h ${DESTDIR}/usr/include/scsi.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 scsi.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/scsi.h \
 	    ${DESTDIR}/usr/include
 
 
diff --git a/lib/libskey/Makefile b/lib/libskey/Makefile
index bdc3999..ebbac7a 100644
--- a/lib/libskey/Makefile
+++ b/lib/libskey/Makefile
@@ -8,8 +8,7 @@ MAN5=	skey.access.5
 CFLAGS+=-DPERMIT_CONSOLE -I${.CURDIR}
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s skey.h ${DESTDIR}/usr/include/skey.h || \
-	  ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 skey.h \
-	  ${DESTDIR}/usr/include
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/skey.h \
+		${DESTDIR}/usr/include
 
 .include <bsd.lib.mk>
diff --git a/lib/libss/Makefile b/lib/libss/Makefile
index cebc01b..54c58e1 100644
--- a/lib/libss/Makefile
+++ b/lib/libss/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1996/05/07 23:19:15 wosch Exp $
+#	$Id: Makefile,v 1.12 1996/06/24 04:23:28 jkh Exp $
 
 LIB=	ss
 SRCS=	ss_err.c data.c error.c execute_cmd.c help.c invocation.c list_rqs.c \
@@ -24,21 +24,14 @@ std_rqs.c:		${.CURDIR}/std_rqs.ct
 	-test -h std_rqs.ct && rm -f std_rqs.ct
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s ss.h ${DESTDIR}/usr/include/ss/ss.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 ss.h \
-	    ${DESTDIR}/usr/include/ss
-	-cd ${.CURDIR}; cmp -s copyright.h \
-	    ${DESTDIR}/usr/include/ss/mit-sipb-copyright.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 copyright.h \
-	    ${DESTDIR}/usr/include/ss/mit-sipb-copyright.h
-	-cd ${.OBJDIR}; \
-	    if [ -f ss_err.h ]; then \
-		cmp -s ss_err.h ${DESTDIR}/usr/include/ss/ss_err.h || \
-		${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \
-		${DESTDIR}/usr/include/ss; \
-	    else \
-		true; \
-	    fi
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/ss.h \
+		${DESTDIR}/usr/include/ss
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/copyright.h \
+		${DESTDIR}/usr/include/ss/mit-sipb-copyright.h
+.if exists(ss_err.h)
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ss_err.h \
+		${DESTDIR}/usr/include/ss
+.endif
 
 .include <bsd.lib.mk>
 
diff --git a/lib/libtermcap/Makefile b/lib/libtermcap/Makefile
index a4b65f5..43974a8 100644
--- a/lib/libtermcap/Makefile
+++ b/lib/libtermcap/Makefile
@@ -20,8 +20,7 @@ LINKS+=	${LIBDIR}/libtermcap_p.a ${LIBDIR}/libtermlib_p.a
 .endif
 
 beforeinstall:
-	-cd ${.CURDIR}; cmp -s termcap.h ${DESTDIR}/usr/include/termcap.h || \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 termcap.h \
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 termcap.h \
 	    ${DESTDIR}/usr/include
 
 .include <bsd.lib.mk>
diff --git a/lib/msun/Makefile b/lib/msun/Makefile
index 81b2e46..eae8a37 100644
--- a/lib/msun/Makefile
+++ b/lib/msun/Makefile
@@ -1,5 +1,5 @@
 #  @(#)Makefile 5.1beta 93/09/24
-#  $Id: Makefile,v 1.8 1996/02/09 00:45:39 mpp Exp $
+#  $Id: Makefile,v 1.9 1996/02/09 00:48:52 mpp Exp $
 #
 #  ====================================================
 #  Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
@@ -139,9 +139,7 @@ MLINKS+=tanh.3 tanhf.3
 
 # XXX we should have only one math.h, and a rule for installing .h's...
 beforeinstall:
-	@${ECHO} Installing new math.h
-	@(cd ${.CURDIR}/src; cmp -s math.h ${DESTDIR}/usr/include/math.h || \
-		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 444 math.h \
-		${DESTDIR}/usr/include/math.h;)
+	${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 ${.CURDIR}/src/math.h \
+		${DESTDIR}/usr/include/math.h
 
 .include <bsd.lib.mk>
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index e8bb8c4..dd32bad 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -1,5 +1,5 @@
 # Makefile for ncurses
-# $Id: Makefile,v 1.16 1996/05/27 22:58:29 wosch Exp $
+# $Id: Makefile,v 1.17 1996/08/26 09:25:20 peter Exp $
 
 LIB=    ncurses
 SHLIB_MAJOR= 3
@@ -23,13 +23,10 @@ CLEANFILES+= lib_keyname.c keys.tries
 beforedepend: keys.tries
 
 beforeinstall:
-	@cd ${.CURDIR}; for i in unctrl.h; do \
-	  cmp -s $$i ${DESTDIR}/usr/include/$$i || \
-	  $(INSTALL) -c -m 444 -o $(BINOWN) -g $(BINGRP) $$i \
-	  ${DESTDIR}/usr/include; done
-	@cd ${.CURDIR}; cmp -s curses.h ${DESTDIR}/usr/include/ncurses.h || \
-	  $(INSTALL) -c -m 444 -o $(BINOWN) -g $(BINGRP) curses.h \
-	  ${DESTDIR}/usr/include/ncurses.h
+	${INSTALL} -C -m 444 -o $(BINOWN) -g $(BINGRP) ${.CURDIR}/unctrl.h \
+		${DESTDIR}/usr/include
+	${INSTALL} -C -m 444 -o $(BINOWN) -g $(BINGRP) ${.CURDIR}/curses.h \
+		${DESTDIR}/usr/include/ncurses.h
 
 keys.tries: ${.CURDIR}/keys.list ${.CURDIR}/MKkeys.awk
 	awk -f ${.CURDIR}/MKkeys.awk ${.CURDIR}/keys.list > keys.tries