From b56bc45bfcdb2bbd2c68a825701b2901f5ab1783 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Sat, 14 Oct 2000 00:17:18 +0000
Subject: Group logical expressions correctly.

---
 emulators/compat12/Makefile    | 5 +++--
 emulators/compat12/pkg/INSTALL | 7 +++----
 emulators/compat13/Makefile    | 5 +++--
 emulators/compat13/pkg/INSTALL | 7 +++----
 4 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'emulators')

diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile
index 287fac0d1f7..0c6a0570eed 100644
--- a/emulators/compat12/Makefile
+++ b/emulators/compat12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/10/14 00:01:56 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2000/10/14 00:17:18 jlam Exp $
 #
 
 DISTNAME=		compat12-${MACHINE_ARCH}
@@ -21,7 +21,8 @@ INSTALL_FILE=		${WRKDIR}/INSTALL
 .include "../../mk/bsd.prefs.mk"
 
 # This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
+.if ${OBJECT_FMT} == "ELF" && \
+    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
 EMULSUBDIR=		emul/aout
 COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
 .else
diff --git a/emulators/compat12/pkg/INSTALL b/emulators/compat12/pkg/INSTALL
index 047eb557136..b1e40d239a0 100644
--- a/emulators/compat12/pkg/INSTALL
+++ b/emulators/compat12/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2000/10/14 00:01:58 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2000/10/14 00:17:19 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -15,9 +15,8 @@ POST-INSTALL)
 	# Only create the symlink on certain platform/object combinations.
 	#
 	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" -a \
-	     "${MACHINE_ARCH}" = "i386" -o \
-	     "${MACHINE_ARCH}" = "sparc" ]
+	if [ "${OBJECT_FMT}" = "ELF" ] && \
+	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
 	then
 		create_emul_symlink=1
 	fi
diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile
index e722086e0df..873b66b5d2c 100644
--- a/emulators/compat13/Makefile
+++ b/emulators/compat13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/10/14 00:01:58 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2000/10/14 00:17:19 jlam Exp $
 #
 
 DISTNAME=		compat13-${MACHINE_ARCH}
@@ -23,7 +23,8 @@ INSTALL_FILE=		${WRKDIR}/INSTALL
 .include "../../mk/bsd.prefs.mk"
 
 # This installs in /usr (or /emul/aout/usr) to avoid dynamic linker annoyances
-.if ${MACHINE_ARCH} == "i386" && ${OBJECT_FMT} == "ELF"
+.if ${OBJECT_FMT} == "ELF" && \
+    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")
 EMULSUBDIR=		emul/aout
 COMPAT_LIBDIR=		${EMULSUBDIR}/usr/lib
 .else
diff --git a/emulators/compat13/pkg/INSTALL b/emulators/compat13/pkg/INSTALL
index c1dd6e343a1..28ccdbfd0fc 100644
--- a/emulators/compat13/pkg/INSTALL
+++ b/emulators/compat13/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.2 2000/10/14 00:01:58 jlam Exp $
+# $NetBSD: INSTALL,v 1.3 2000/10/14 00:17:19 jlam Exp $
 
 PKGNAME=$1
 STAGE=$2
@@ -20,9 +20,8 @@ POST-INSTALL)
 	# Only create the symlink on certain platform/object combinations.
 	#
 	create_emul_symlink=0
-	if [ "${OBJECT_FMT}" = "ELF" -a \
-	     "${MACHINE_ARCH}" = "i386" -o \
-	     "${MACHINE_ARCH}" = "sparc" ]
+	if [ "${OBJECT_FMT}" = "ELF" ] && \
+	   [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "sparc" ]
 	then
 		create_emul_symlink=1
 	fi
-- 
cgit v1.2.3