PERFORCE change 121262 for review

[Gabor Kovesdan]

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

Change 121262 by gabor at 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; \