PERFORCE change 142094 for review

[John Birrell]

http://perforce.freebsd.org/chv.cgi?CH=142094

Change 142094 by jb at freebsd3 on 2008/05/23 04:44:40

	IFC

Affected files ...

.. //depot/projects/dtrace/src/Makefile#22 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#46 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#10 integrate

Differences ...

==== //depot/projects/dtrace/src/Makefile#22 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile,v 1.348 2008/04/29 09:08:33 rwatson Exp $
+# $FreeBSD: src/Makefile,v 1.349 2008/05/23 04:20:59 jb Exp $
 #
 # The user-driven targets are:
 #

==== //depot/projects/dtrace/src/Makefile.inc1#46 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.604 2008/05/07 13:52:56 dfr Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.605 2008/05/23 04:22:14 jb Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir

==== //depot/projects/dtrace/src/usr.sbin/config/mkmakefile.c#10 (text+ko) ====

@@ -32,7 +32,7 @@
 static char sccsid[] = "@(#)mkmakefile.c	8.1 (Berkeley) 6/6/93";
 #endif
 static const char rcsid[] =
-  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.91 2006/10/24 07:12:31 imp Exp $";
+  "$FreeBSD: src/usr.sbin/config/mkmakefile.c,v 1.92 2008/05/23 03:55:26 jb Exp $";
 #endif /* not lint */
 
 /*