diff options
| author | dmcmahill <dmcmahill@pkgsrc.org> | 2003-09-30 09:06:01 +0000 |
|---|---|---|
| committer | dmcmahill <dmcmahill@pkgsrc.org> | 2003-09-30 09:06:01 +0000 |
| commit | bab6a6635383140af154515a02a50af06be46be7 (patch) | |
| tree | a1b4ca3ad50be1a92ff3dbd5ec1b4ae6064aaa8c /www | |
| parent | f8f37833cd7e70e74e16681fba8e081968f39070 (diff) | |
| download | pkgsrc-bab6a6635383140af154515a02a50af06be46be7.tar.gz | |
only pull in ../../emulators/suse_linux/Makefile.application if we are
actually using a Linux version of netscape. Fixes build on alpha under
compat_osf1 and probably sparc under compat_svr4.
Diffstat (limited to 'www')
| -rw-r--r-- | www/navigator/Makefile.common | 14 | ||||
| -rw-r--r-- | www/netscape/Makefile | 6 |
2 files changed, 17 insertions, 3 deletions
diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index ab02631f00e..c9b72b87948 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.65 2003/08/08 10:02:02 grant Exp $ +# $NetBSD: Makefile.common,v 1.66 2003/09/30 09:06:01 dmcmahill Exp $ # # Common include file for communicator and navigator packages @@ -231,7 +231,17 @@ do-install: .endif +.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "i386" && !defined(NS_USE_BSDI) +NS_NEED_LINUX= yes +.elif ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc" +NS_NEED_LINUX= yes +.elif ${OPSYS} == "Linux" +NS_NEED_LINUX= yes +.endif + .if ${BINNAME} != "netscape" USE_BUILDLINK2= # defined -. include "../../emulators/suse_linux/Makefile.application" +. if defined(NS_NEED_LINUX) +. include "../../emulators/suse_linux/Makefile.application" +. endif .endif diff --git a/www/netscape/Makefile b/www/netscape/Makefile index 4a5bfaefde1..180f0e3e341 100644 --- a/www/netscape/Makefile +++ b/www/netscape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/08/08 09:38:39 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/30 09:06:01 dmcmahill Exp $ # COMMENT= Open new window using netscape-like browser @@ -33,5 +33,9 @@ do-build: do-install: ${INSTALL_SCRIPT} ${WRKSRC}/netscape ${PREFIX}/bin/netscape +# this will be set in ../navigator/Makefile.common if we are using a linux +# netscape. +.if defined(NS_NEED_LINUX) .include "../../emulators/suse_linux/Makefile.application" +.endif .include "../../mk/bsd.pkg.mk" |