===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cpp/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- src/usr.bin/cpp/Makefile	2004/02/10 02:02:22	1.8
+++ src/usr.bin/cpp/Makefile	2010/05/03 18:34:01	1.9
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2004/02/10 02:02:22 espie Exp $
+#	$OpenBSD: Makefile,v 1.9 2010/05/03 18:34:01 drahn Exp $
 
 .include <bsd.own.mk>
 
@@ -7,12 +7,16 @@
 PROG=cpp
 SRCS=
 INSTALL_STRIP=
+USE_GCC3?="no"
+USE_GCC4?="no"
 
 cpp: cpp.sh
-.if ${USE_GCC3:L} == "no"
-	sed -e 's/@dollaropt@/-$$/' ${.CURDIR}/cpp.sh >$@
+.if ${USE_GCC3:L} == "yes"
+	sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
+.elif ${USE_GCC4:L} == "yes"
+	sed -e 's/@GNUC@//' -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
 .else
-	sed -e 's/@dollaropt@//' ${.CURDIR}/cpp.sh >$@
+	sed -e 's/@GNUC@/-D__GNUC__/' -e 's/@dollaropt@/-$$/' ${.CURDIR}/cpp.sh >$@
 .endif
 
 .include <bsd.prog.mk>