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

5 files changed, 12 insertions, 18 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>