diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-01-16 23:56:35 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-01-16 23:56:35 +0000 |
| commit | bde0ff6e3ba75d689a550d6ba0d4e863a26daf22 (patch) | |
| tree | 5bbb1d113d967efd8f34f2a4b97ce15f884369e4 /www | |
| parent | 14d9caa8162fa898a742b0d18aa5ffabba54666a (diff) | |
| download | pkgsrc-bde0ff6e3ba75d689a550d6ba0d4e863a26daf22.tar.gz | |
use ${MOZILLA} instead of seamonkey for the path to the pkgconfig files.
This gets this right for thunderbird and doesn't change seamonkey.
Diffstat (limited to 'www')
| -rw-r--r-- | www/seamonkey/Makefile.common | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/www/seamonkey/Makefile.common b/www/seamonkey/Makefile.common index 2786aea713e..df6e4006a70 100644 --- a/www/seamonkey/Makefile.common +++ b/www/seamonkey/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2007/01/10 10:25:13 joerg Exp $ +# $NetBSD: Makefile.common,v 1.18 2007/01/16 23:56:35 dmcmahill Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= seamonkey-${MOZ_DIST_VER}.source @@ -30,12 +30,12 @@ CONFIG_STATUS_OVERRIDE= build/config.status CONFIG_STATUS_OVERRIDE+= nsprpub/config.status CONFIG_STATUS_OVERRIDE+= directory/c-sdk/config.status -PKGCONFIG_OVERRIDE+= build/unix/seamonkey-gtkmozembed.pc -PKGCONFIG_OVERRIDE+= build/unix/seamonkey-js.pc -PKGCONFIG_OVERRIDE+= build/unix/seamonkey-nspr.pc -PKGCONFIG_OVERRIDE+= build/unix/seamonkey-nss.pc -PKGCONFIG_OVERRIDE+= build/unix/seamonkey-plugin.pc -PKGCONFIG_OVERRIDE+= build/unix/seamonkey-xpcom.pc +PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-gtkmozembed.pc +PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-js.pc +PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-nspr.pc +PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-nss.pc +PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-plugin.pc +PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-xpcom.pc # Some .pc files are filled in by the build process, so we can't fix the # rpaths until this has happened. PKGCONFIG_OVERRIDE_STAGE= post-build @@ -128,6 +128,10 @@ PLIST_SUBST+= SUNOSLIB="@comment " SCRIPTS_ENV+= SUNOSLIB="@comment " .endif +.if ${OPSYS} == "SunOS" && ${PKGSRC_COMPILER} == "gcc" +MAKEFLAGS+= NS_USE_GCC=YES +.endif + SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} SCRIPTS_ENV+= SED=${SED:Q} |