diff options
| author | jlam <jlam@pkgsrc.org> | 2000-10-14 00:17:18 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2000-10-14 00:17:18 +0000 |
| commit | b56bc45bfcdb2bbd2c68a825701b2901f5ab1783 (patch) | |
| tree | a376563ef609332b47ca93073256b06f2a4ed415 /emulators/compat12 | |
| parent | 943a1e9a35622707805ab9d9d67ed3fb8a9bda60 (diff) | |
| download | pkgsrc-b56bc45bfcdb2bbd2c68a825701b2901f5ab1783.tar.gz | |
Group logical expressions correctly.
Diffstat (limited to 'emulators/compat12')
| -rw-r--r-- | emulators/compat12/Makefile | 5 | ||||
| -rw-r--r-- | emulators/compat12/pkg/INSTALL | 7 |
2 files changed, 6 insertions, 6 deletions
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 |