[pkgsrc/trunk]: pkgsrc/www only pull in ../../emulators/suse_linux/Makefile.a...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/afa1ae7c5f47
branches:  trunk
changeset: 462310:afa1ae7c5f47
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Tue Sep 30 09:06:01 2003 +0000

description:
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:

 www/navigator/Makefile.common |  14 ++++++++++++--
 www/netscape/Makefile         |   6 +++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diffs (47 lines):

diff -r c5c231927fd6 -r afa1ae7c5f47 www/navigator/Makefile.common
--- a/www/navigator/Makefile.common     Tue Sep 30 08:29:09 2003 +0000
+++ b/www/navigator/Makefile.common     Tue Sep 30 09:06:01 2003 +0000
@@ -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 @@
 
 .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 -r c5c231927fd6 -r afa1ae7c5f47 www/netscape/Makefile
--- a/www/netscape/Makefile     Tue Sep 30 08:29:09 2003 +0000
+++ b/www/netscape/Makefile     Tue Sep 30 09:06:01 2003 +0000
@@ -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-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"