Switch to using COMPILER_VERSION instead of USE_GCC3, allows for more flexible

complier picking, eg supporting gcc2, gcc3, and gcc4. based on diff by Marco,
with fixes from espie@.
ok espie@ general mumbling of approval of others.

3 files changed, 10 insertions, 9 deletions

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index bc31600029d..1a89636719e 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,14 +1,15 @@
-#	$OpenBSD: Makefile,v 1.45 2007/03/23 02:17:52 ray Exp $
+#	$OpenBSD: Makefile,v 1.46 2010/05/10 18:20:31 drahn Exp $
 #	$NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
 
 .include <bsd.own.mk>
-USE_GCC3?=No
 
 .if make(obj)
-SUBDIR+=	gcc ../egcs/gcc
+SUBDIR+=	cc gcc ../egcs/gcc
 .else
-.  if ${USE_GCC3:L} == "yes"
+.  if ${COMPILER_VERSION:L} == "gcc3"
 SUBDIR+=	gcc
+.  elif ${COMPILER_VERSION:L} == "gcc4"
+SUBDIR+=	cc
 .  else
 SUBDIR+=	../egcs/gcc
 .  endif
diff --git a/gnu/usr.bin/cc/include/Makefile b/gnu/usr.bin/cc/include/Makefile
index 65a37d80868..aa653abb955 100644
--- a/gnu/usr.bin/cc/include/Makefile
+++ b/gnu/usr.bin/cc/include/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/gnu/usr.bin/cc/include/Makefile,v 1.9.8.1 2009/04/15 03:14:26 kensmith Exp $
-# $OpenBSD: Makefile,v 1.6 2010/05/10 14:17:52 marco Exp $
+# $OpenBSD: Makefile,v 1.7 2010/05/10 18:20:31 drahn Exp $
 
 .include <bsd.own.mk>
 
@@ -33,7 +33,7 @@ depend:
 	# Nothing here so far...
 
 .if !empty(INCS)
-install: ${INCS}
+install includes: ${INCS}
 	${INSTALL} -C -o ${BINOWN} -g ${LOCALEGRP} -m ${NONBINMODE} ${.ALLSRC} \
 		${DESTDIR}/usr/include
 .else
diff --git a/gnu/usr.bin/perl/Makefile.bsd-wrapper b/gnu/usr.bin/perl/Makefile.bsd-wrapper
index d267907ff48..fee9c576cab 100644
--- a/gnu/usr.bin/perl/Makefile.bsd-wrapper
+++ b/gnu/usr.bin/perl/Makefile.bsd-wrapper
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.81 2010/02/03 20:49:00 miod Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.82 2010/05/10 18:20:31 drahn Exp $
 #
 # Build wrapper for Perl 5.10.0
 #
 
-# For ``NOMAN'' and ``USE_GCC3''
+# For ``NOMAN'' and ``COMPILER_VERSION''
 .include <bsd.own.mk>
 
 # There is no point in building a profiled libperl that is never used.
@@ -15,7 +15,7 @@ TARGET_MACHINE_ARCH?=	$(MACHINE_ARCH)
 
 # Perl builds with -fno-strict-aliasing, we want libperl to do the same
 CFLAGS+= -fno-strict-aliasing
-.if ${USE_GCC3:L} == "yes"
+.if ${COMPILER_VERSION:L} == "gcc3" || ${COMPILER_VERSION:L} == "gcc4"
 CFLAGS+= -fno-delete-null-pointer-checks
 .endif