summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-12-19 19:30:14 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2006-12-19 19:30:14 +0800
commitdee41fcec842fe937de294298297fec0c7f681fa (patch)
treef0fd66bfcca4a82ac6447d30bc46a5c1ed9002e4
parent0adbd36f4ebab944f02303c312c6be0db87bafb0 (diff)
downloadmarcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.tar
marcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.tar.gz
marcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.tar.bz2
marcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.tar.lz
marcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.tar.xz
marcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.tar.zst
marcuscom-ports-dee41fcec842fe937de294298297fec0c7f681fa.zip
Unbreak install of pkg-config files.
Reported by: marcus git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8079 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--www/mozilla/Makefile.common8
1 files changed, 4 insertions, 4 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index ba29d9e22..f4445c30a 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -4,7 +4,7 @@
# Whom: Michael Johnson <ahze@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/www/mozilla/Makefile.common,v 1.37 2006/12/09 16:33:11 ahze Exp $
+# $MCom: ports/www/mozilla/Makefile.common,v 1.38 2006/12/09 17:29:59 ahze Exp $
# This file contains some reusable components for mozilla ports. It's of
# use primarily to apps from the mozilla project itself (such as Firefox,
@@ -336,7 +336,7 @@ gecko-pre-install:
.if defined(MOZILLA_SUFX) && ${MOZILLA_SUFX}!="none"
${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//} ${FAKEDIR}/bin/${MOZILLA}
${MV} ${FAKEDIR}/bin/${MOZILLA:S/${MOZILLA_SUFX}//}-config ${FAKEDIR}/bin/${MOZILLA}-config
-.for pc in ${PKGCONFIG_FILES:S|${MOZILLA_SUFX}||}
+.for pc in ${MOZ_PKGCONFIG_FILES:S|${MOZILLA_SUFX}||}
${SED} -e 's|Requires: ${MOZILLA:S/${MOZILLA_SUFX}//}|Requires: ${MOZILLA}|' \
${FAKEDIR}/lib/pkgconfig/${pc}.pc > ${FAKEDIR}/lib/pkgconfig/${pc:S/${MOZILLA:S,${MOZILLA_SUFX},,}/${MOZILLA}/}.pc
.endfor
@@ -371,7 +371,7 @@ gecko-create-plist:
${FIND} -d * -type d | \
${SED} -e 's|^|@dirrm ${dir}/|' >> ${PLIST}
.endfor
-.for pcfile in ${PKGCONFIG_FILES}
+.for pcfile in ${MOZ_PKGCONFIG_FILES}
${ECHO_CMD} "libdata/pkgconfig/${pcfile}.pc" >> ${PLIST}
@${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g' \
-e 's|${MOZILLA}-nspr = ${PORTVERSION}|nspr|' \
@@ -394,7 +394,7 @@ gecko-do-install:
cd ${FAKEDIR}/${dir} && ${FIND} . | \
${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${dir}
.endfor
-.for pcfile in ${PKGCONFIG_FILES}
+.for pcfile in ${MOZ_PKGCONFIG_FILES}
${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \
${PREFIX}/libdata/pkgconfig/${pcfile}.pc
.endfor