diff options
| author | xtraeme <xtraeme> | 2004-06-19 00:25:04 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme> | 2004-06-19 00:25:04 +0000 |
| commit | 564121cc0a809139aa82b945c6db974d367b3990 (patch) | |
| tree | c04ae8231b5e4d9bf730955e726027ff4fe0dc50 | |
| parent | b3a97cb9cc19168802d7b56dc5bd4a8a12ebb70b (diff) | |
| download | pkgsrc-564121cc0a809139aa82b945c6db974d367b3990.tar.gz | |
Fix pkgconfig files, they were using mozilla-1.6 as its directory to
find the headers/files, and this breaks some packages using the .pc files
with firefox*.
| -rw-r--r-- | www/mozilla/Makefile.common | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 6aafaf98b67..3dab04a93b6 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2004/06/02 14:32:22 taya Exp $ +# $NetBSD: Makefile.common,v 1.42 2004/06/19 00:25:04 xtraeme Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -81,7 +81,8 @@ CONFIGURE_ARGS+= --enable-calendar CONFIGURE_ARGS+= --enable-mathml .endif -.if exists(${X11BASE}/include/X11/extensions/Xinerama.h) && exists(${X11BASE}/lib/libXinerama.so) +.if exists(${X11BASE}/include/X11/extensions/Xinerama.h) && \ + exists(${X11BASE}/lib/libXinerama.so) CONFIGURE_ARGS+= --enable-xinerama .endif @@ -143,8 +144,10 @@ pre-configure: cd ${WRKSRC}/nsprpub && ${AUTOCONF} post-build: - ${ECHO} skin,install,select,classic/1.0 >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt - ${ECHO} locale,install,select,en-US >> ${WRKSRC}/dist/bin/chrome/installed-chrome.txt + ${ECHO} skin,install,select,classic/1.0 >> \ + ${WRKSRC}/dist/bin/chrome/installed-chrome.txt + ${ECHO} locale,install,select,en-US >> \ + ${WRKSRC}/dist/bin/chrome/installed-chrome.txt do-install: ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR}/moz-install @@ -164,5 +167,13 @@ CONFIGURE_ARGS+= --enable-xft .include "../../fonts/Xft2/buildlink3.mk" .endif +# Fix for firefox* packages. +SUBST_CLASSES= pc +SUBST_STAGE.pc= post-extract +SUBST_FILES.pc= build/unix/*.pc.in +SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \ + -e "s|%libdir%|${PREFIX}/lib/${MOZILLA}|g" +SUBST_MESSAGE.pc= "Fixing pkgconfig files." + .include "../../mk/autoconf.mk" .include "../../mk/bsd.pkg.mk" |