From owner-p4-projects@FreeBSD.ORG  Mon Jun  9 06:45:14 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E5456106567C; Mon,  9 Jun 2008 06:45:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A627E1065677
	for <perforce@freebsd.org>; Mon,  9 Jun 2008 06:45:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 923E98FC1C
	for <perforce@freebsd.org>; Mon,  9 Jun 2008 06:45:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m596jDAX081785
	for <perforce@freebsd.org>; Mon, 9 Jun 2008 06:45:13 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m596jDXP081783
	for perforce@freebsd.org; Mon, 9 Jun 2008 06:45:13 GMT
	(envelope-from jb@freebsd.org)
Date: Mon, 9 Jun 2008 06:45:13 GMT
Message-Id: <200806090645.m596jDXP081783@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 143183 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jun 2008 06:45:14 -0000

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

Change 143183 by jb@freebsd3 on 2008/06/09 06:45:05

	IFC

Affected files ...

.. //depot/projects/dtrace6/src/usr.sbin/config/mkmakefile.c#3 edit
.. //depot/projects/dtrace7/src/usr.sbin/config/mkmakefile.c#3 edit

Differences ...

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

@@ -734,7 +734,7 @@
 				printf("config: don't know rules for %s\n", np);
 				break;
 			}
-			snprintf(cmd, sizeof(cmd), "${%s_%c%s}\r\n\t${NORMAL_CTFCONVERT}", ftype,
+			snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t${NORMAL_CTFCONVERT}", ftype,
 			    toupper(och),
 			    ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
 			compilewith = cmd;

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

@@ -735,7 +735,7 @@
 				printf("config: don't know rules for %s\n", np);
 				break;
 			}
-			snprintf(cmd, sizeof(cmd), "${%s_%c%s}; ${NORMAL_CTFCONVERT}", ftype,
+			snprintf(cmd, sizeof(cmd), "${%s_%c%s}\n\t${NORMAL_CTFCONVERT}", ftype,
 			    toupper(och),
 			    ftp->f_flags & NOWERROR ? "_NOWERROR" : "");
 			compilewith = cmd;