From owner-p4-projects@FreeBSD.ORG  Fri Aug  4 00:41:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9CE3616A4E5; Fri,  4 Aug 2006 00:41:23 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5832516A4E0
	for <perforce@freebsd.org>; Fri,  4 Aug 2006 00:41:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 24E0343D55
	for <perforce@freebsd.org>; Fri,  4 Aug 2006 00:41:23 +0000 (GMT)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k740fMAR001013
	for <perforce@freebsd.org>; Fri, 4 Aug 2006 00:41:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k740fMU1001010
	for perforce@freebsd.org; Fri, 4 Aug 2006 00:41:22 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 4 Aug 2006 00:41:22 GMT
Message-Id: <200608040041.k740fMU1001010@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 103149 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: Fri, 04 Aug 2006 00:41:23 -0000

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

Change 103149 by jb@jb_freebsd2 on 2006/08/04 00:41:13

	Add the library to the other libraries rather than clobbering them.
	
	Adding LIBPTHREAD as a library dependency is a bit silly because it's
	an absolute path and the thread library isn't necessarily libpthread.

Affected files ...

.. //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#4 edit

Differences ...

==== //depot/projects/dtrace/src/usr.sbin/pppctl/Makefile#4 (text+ko) ====

@@ -9,8 +9,7 @@
 LDADD=	-ledit -ltermcap
 
 .if ${MK_LIBC_THREADS} == "no"
-DPADD=	${LIBPTHREAD}
-LDADD=	-lpthread
+LDADD+=	-lpthread
 .endif
 
 .include <bsd.prog.mk>