diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/compat12/Makefile | 7 | ||||
| -rw-r--r-- | emulators/compat12/pkg/DEINSTALL | 7 | ||||
| -rw-r--r-- | emulators/compat12/pkg/INSTALL | 11 | ||||
| -rw-r--r-- | emulators/compat13/Makefile | 4 | ||||
| -rw-r--r-- | emulators/compat13/pkg/DEINSTALL | 7 | ||||
| -rw-r--r-- | emulators/compat13/pkg/INSTALL | 11 |
6 files changed, 38 insertions, 9 deletions
diff --git a/emulators/compat12/Makefile b/emulators/compat12/Makefile index c5754f5e846..287fac0d1f7 100644 --- a/emulators/compat12/Makefile +++ b/emulators/compat12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2000/10/13 23:36:37 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2000/10/14 00:01:56 jlam Exp $ # DISTNAME= compat12-${MACHINE_ARCH} @@ -32,10 +32,13 @@ COMPAT_LIBDIR= lib PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} do-build: - ${SED} -e "s,@COMPAT_LIBDIR@,${COMPAT_LIBDIR},g" \ + ${SED} -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \ + -e "s,@COMPAT_LIBDIR@,${COMPAT_LIBDIR},g" \ + -e "s,@LDCONFIG@,${LDCONFIG},g" \ < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \ -e "s,@OBJECT_FMT@,${OBJECT_FMT},g" \ + -e "s,@LDCONFIG@,${LDCONFIG},g" \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} do-install: diff --git a/emulators/compat12/pkg/DEINSTALL b/emulators/compat12/pkg/DEINSTALL index 73869caeeba..246679b1e2a 100644 --- a/emulators/compat12/pkg/DEINSTALL +++ b/emulators/compat12/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2000/10/13 23:36:39 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2000/10/14 00:01:58 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -12,6 +12,11 @@ POST-DEINSTALL) COMPAT_LIBDIR=@COMPAT_LIBDIR@ rmdir -p ${PKG_PREFIX}/${COMPAT_LIBDIR} 2>/dev/null || true + + # Regenerate the shared library cache. This should work on either + # a.out or on ELF with the 1.5 release. + # + ( @LDCONFIG@ || true ) >/dev/null 2>&1 ;; *) echo "Unexpected argument: ${STAGE}" diff --git a/emulators/compat12/pkg/INSTALL b/emulators/compat12/pkg/INSTALL index 0085009a490..047eb557136 100644 --- a/emulators/compat12/pkg/INSTALL +++ b/emulators/compat12/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2000/10/13 23:36:39 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2000/10/14 00:01:58 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -15,7 +15,9 @@ POST-INSTALL) # Only create the symlink on certain platform/object combinations. # create_emul_symlink=0 - if [ "${MACHINE_ARCH}" = "i386" -a "${OBJECT_FMT}" = "ELF" ] + if [ "${OBJECT_FMT}" = "ELF" -a \ + "${MACHINE_ARCH}" = "i386" -o \ + "${MACHINE_ARCH}" = "sparc" ] then create_emul_symlink=1 fi @@ -47,6 +49,11 @@ EOF fi fi fi + + # Regenerate the shared library cache. This should work on either + # a.out or on ELF with the 1.5 release. + # + ( @LDCONFIG@ || true ) >/dev/null 2>&1 ;; *) echo "Unexpected argument: ${STAGE}" diff --git a/emulators/compat13/Makefile b/emulators/compat13/Makefile index c9e9cea6ec7..e722086e0df 100644 --- a/emulators/compat13/Makefile +++ b/emulators/compat13/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/10/13 23:36:40 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2000/10/14 00:01:58 jlam Exp $ # DISTNAME= compat13-${MACHINE_ARCH} @@ -36,9 +36,11 @@ PLIST_SUBST+= COMPAT_LIBDIR=${COMPAT_LIBDIR} do-build: ${SED} -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \ -e "s,@COMPAT_LIBDIR@,${COMPAT_LIBDIR},g" \ + -e "s,@LDCONFIG@,${LDCONFIG},g" \ < ${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE} ${SED} -e "s,@MACHINE_ARCH@,${MACHINE_ARCH},g" \ -e "s,@OBJECT_FMT@,${OBJECT_FMT},g" \ + -e "s,@LDCONFIG@,${LDCONFIG},g" \ < ${PKGDIR}/INSTALL > ${INSTALL_FILE} do-install: diff --git a/emulators/compat13/pkg/DEINSTALL b/emulators/compat13/pkg/DEINSTALL index 56b12c40956..d5b84a0d5ab 100644 --- a/emulators/compat13/pkg/DEINSTALL +++ b/emulators/compat13/pkg/DEINSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: DEINSTALL,v 1.1 2000/10/13 23:36:40 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2000/10/14 00:01:58 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -19,6 +19,11 @@ POST-DEINSTALL) fi rmdir -p ${PKG_PREFIX}/${COMPAT_LIBDIR} 2>/dev/null || true + + # Regenerate the shared library cache. This should work on either + # a.out or on ELF with the 1.5 release. + # + ( @LDCONFIG@ || true ) >/dev/null 2>&1 ;; *) echo "Unexpected argument: ${STAGE}" diff --git a/emulators/compat13/pkg/INSTALL b/emulators/compat13/pkg/INSTALL index 2f16d9a74c6..c1dd6e343a1 100644 --- a/emulators/compat13/pkg/INSTALL +++ b/emulators/compat13/pkg/INSTALL @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: INSTALL,v 1.1 2000/10/13 23:36:40 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2000/10/14 00:01:58 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -20,7 +20,9 @@ POST-INSTALL) # Only create the symlink on certain platform/object combinations. # create_emul_symlink=0 - if [ "${MACHINE_ARCH}" = "i386" -a "${OBJECT_FMT}" = "ELF" ] + if [ "${OBJECT_FMT}" = "ELF" -a \ + "${MACHINE_ARCH}" = "i386" -o \ + "${MACHINE_ARCH}" = "sparc" ] then create_emul_symlink=1 fi @@ -52,6 +54,11 @@ EOF fi fi fi + + # Regenerate the shared library cache. This should work on either + # a.out or on ELF with the 1.5 release. + # + ( @LDCONFIG@ || true ) >/dev/null 2>&1 ;; *) echo "Unexpected argument: ${STAGE}" |