diff options
| author | grant <grant@pkgsrc.org> | 2004-01-06 01:33:32 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-01-06 01:33:32 +0000 |
| commit | d507022a69712d7b8de16a23b50db848afb73666 (patch) | |
| tree | 9b9fb589459fdb54bc232eadbf2143f43990929c /www/mozilla-bin | |
| parent | 53c6112909cd99056dc9ed1943062c2771232c84 (diff) | |
| download | pkgsrc-d507022a69712d7b8de16a23b50db848afb73666.tar.gz | |
*really* allow MOZ_EXTRA to be overridden and fix gtk2 dependency.
fixes gtk2 packages.
Diffstat (limited to 'www/mozilla-bin')
| -rw-r--r-- | www/mozilla-bin/Makefile.common | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common index 92438125566..acd5e7c8804 100644 --- a/www/mozilla-bin/Makefile.common +++ b/www/mozilla-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2004/01/04 05:06:19 grant Exp $ +# $NetBSD: Makefile.common,v 1.3 2004/01/06 01:33:32 grant Exp $ # DISTNAME= # see Makefile.${OPSYS}.${ARCH} @@ -37,9 +37,10 @@ ARCH=${MACHINE_ARCH:C/i[3-6]86/i386/g} .endif # suffix gtk2 builds with -gtk2 -MOZ_EXTRA= # empty .if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES" MOZ_EXTRA?= -gtk2 +.else +MOZ_EXTRA?= # empty .endif MOZILLA_LIB= ${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} @@ -84,7 +85,7 @@ _COMPAT16_LIBSTDCXX= YES # gtk2 builds. . if defined(MOZ_GTK2) && ${MOZ_GTK2} == "YES" -DEPENDS+= gtk+>=2.2:../../x11/gtk2 +DEPENDS+= gtk2+>=2.2:../../x11/gtk2 . else # default to at least gtk-1.2. @@ -158,7 +159,7 @@ post-install: ${LN} -s ${PREFIX}/emul/netbsd16/usr/lib/libstdc++.so* . .endif @${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC} - @${ECHO} bin/${MOZILLA}-${MOZ_PLATFORM} >> ${PLIST_SRC} + @${ECHO} bin/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} >> ${PLIST_SRC} @${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print \ | ${SORT} | ${SED} -e "s,${PREFIX}/,,g" \ >> ${PLIST_SRC} |