From owner-p4-projects@FreeBSD.ORG  Sat Jun  9 10:01:22 2007
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 8454416A46F; Sat,  9 Jun 2007 10:01:22 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C94C516A468
	for <perforce@freebsd.org>; Sat,  9 Jun 2007 10:01:21 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id B64B013C45E
	for <perforce@freebsd.org>; Sat,  9 Jun 2007 10:01:21 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l59A1LRq053311
	for <perforce@freebsd.org>; Sat, 9 Jun 2007 10:01:21 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l59A1L9Z053296
	for perforce@freebsd.org; Sat, 9 Jun 2007 10:01:21 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 9 Jun 2007 10:01:21 GMT
Message-Id: <200706091001.l59A1L9Z053296@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 121262 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: Sat, 09 Jun 2007 10:01:22 -0000

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

Change 121262 by gabor@gabor_server on 2007/06/09 10:01:20

	s/TARGETDIR/PREFIX/ update after IFC.

Affected files ...

.. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#16 edit

Differences ...

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

@@ -1319,11 +1319,11 @@
 INDEXDIR?=		${PORTSDIR}
 INDEXFILE?=		INDEX-${OSVERSION:C/([0-9]).*/\1/}
 
-DOCSDIR?=		${TARGETDIR}/share/doc/${PORTNAME}
-EXAMPLESDIR?=		${TARGETDIR}/share/examples/${PORTNAME}
-DATADIR?=		${TARGETDIR}/share/${PORTNAME}
-WWWDIR?=		${TARGETDIR}/www/${PORTNAME}
-ETCDIR?=		${TARGETDIR}/etc/${PORTNAME}
+DOCSDIR?=		${PREFIX}/share/doc/${PORTNAME}
+EXAMPLESDIR?=		${PREFIX}/share/examples/${PORTNAME}
+DATADIR?=		${PREFIX}/share/${PORTNAME}
+WWWDIR?=		${PREFIX}/www/${PORTNAME}
+ETCDIR?=		${PREFIX}/etc/${PORTNAME}
 
 .if defined(USE_LINUX_RPM)
 .include "${PORTSDIR}/Mk/bsd.linux-rpm.mk"
@@ -2950,11 +2950,11 @@
 INFO_PATH?=	info
 .endif
 
-DOCSDIR_REL?=	${DOCSDIR:S,^${TARGETDIR}/,,}
-EXAMPLESDIR_REL?=	${EXAMPLESDIR:S,^${TARGETDIR}/,,}
-DATADIR_REL?=	${DATADIR:S,^${TARGETDIR}/,,}
-WWWDIR_REL?=	${WWWDIR:S,^${TARGETDIR}/,,}
-ETCDIR_REL?=	${ETCDIR:S,^${TARGETDIR}/,,}
+DOCSDIR_REL?=	${DOCSDIR:S,^${PREFIX}/,,}
+EXAMPLESDIR_REL?=	${EXAMPLESDIR:S,^${PREFIX}/,,}
+DATADIR_REL?=	${DATADIR:S,^${PREFIX}/,,}
+WWWDIR_REL?=	${WWWDIR:S,^${PREFIX}/,,}
+ETCDIR_REL?=	${ETCDIR:S,^${PREFIX}/,,}
 
 PLIST_SUB+=	DOCSDIR="${DOCSDIR_REL}" \
 		EXAMPLESDIR="${EXAMPLESDIR_REL}" \
@@ -3808,7 +3808,7 @@
 			exit 1; \
 		else \
 			${MTREE_CMD} ${MTREE_ARGS} ${PREFIX}/ >/dev/null; \
-			if [ ${PREFIX} = ${LOCALBASE_REL} ]; then \
+			if [ ${PREFIX} = ${LOCALBASE} ]; then \
 				cd ${PREFIX}/share/nls; \
 				${LN} -shf C POSIX; \
 				${LN} -shf C en_US.US-ASCII; \