From owner-p4-projects@FreeBSD.ORG  Thu Aug 10 17:43:35 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 AB32816A4E7; Thu, 10 Aug 2006 17:43:35 +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 68EEB16A4E5
	for <perforce@FreeBSD.org>; Thu, 10 Aug 2006 17:43:35 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 36BA343D55
	for <perforce@FreeBSD.org>; Thu, 10 Aug 2006 17:43:35 +0000 (GMT)
	(envelope-from gabor@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 k7AHhZ5v041228
	for <perforce@FreeBSD.org>; Thu, 10 Aug 2006 17:43:35 GMT
	(envelope-from gabor@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7AHhZpk041225
	for perforce@freebsd.org; Thu, 10 Aug 2006 17:43:35 GMT
	(envelope-from gabor@FreeBSD.org)
Date: Thu, 10 Aug 2006 17:43:35 GMT
Message-Id: <200608101743.k7AHhZpk041225@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@FreeBSD.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 103585 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: Thu, 10 Aug 2006 17:43:35 -0000

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

Change 103585 by gabor@gabor_spitfire on 2006/08/10 17:42:50

	Fix MLINKS for DESTDIR.
	
	Submitted by:	John E. Hein <jhein at timing dot com>

Affected files ...

.. //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#79 edit

Differences ...

==== //depot/projects/soc2006/gabor_ports/Mk/bsd.port.mk#79 (text+ko) ====

@@ -2592,7 +2592,7 @@
 .endfor
 .endif
 _COUNT=0
-.for ___tpmlinks in ${_MLINKS}
+.for ___tpmlinks in ${_MLINKS:S%^${DESTDIR}%%}
 .if ${_COUNT} == "1"
 _TMLINKS+=	${___tpmlinks}
 _COUNT=0
@@ -5114,7 +5114,7 @@
 	@set ${_MLINKS}; \
 	while :; do \
 		[ $$# -eq 0 ] && break || ${TRUE}; \
-		${RM} -f $${2%.gz}; ${RM} -f $$2.gz; \
+		${RM} -f $${2%.gz}; ${RM} -f $${2%.gz}.gz; \
 		${LN} -fs `${ECHO_CMD} $$1 $$2 | ${AWK} '{ \
 					z=split($$1, a, /\//); x=split($$2, b, /\//); \
 					while (a[i] == b[i]) i++; \