[src/netbsd-1-5]: src/sbin/ldconfig Pullup 1.16 and 1.17 [fvdl]:

[tv <tv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/549382d42ea8
branches:  netbsd-1-5
changeset: 489906:549382d42ea8
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Oct 18 16:42:52 2000 +0000

description:
Pullup 1.16 and 1.17 [fvdl]:
Modification to previous: only build for ports that are a.out or used
to be a.out. No sense in building for ports that never were a.out.
----------------------------
Build this on ELF as well. When on an ELF system, only look in
_PATH_EMUL_AOUT/etc/ld.so.conf.

diffstat:

 sbin/ldconfig/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (23 lines):

diff -r 9b0b8a5daf86 -r 549382d42ea8 sbin/ldconfig/Makefile
--- a/sbin/ldconfig/Makefile    Wed Oct 18 16:31:27 2000 +0000
+++ b/sbin/ldconfig/Makefile    Wed Oct 18 16:42:52 2000 +0000
@@ -1,13 +1,16 @@
-#      $NetBSD: Makefile,v 1.15 1998/12/17 22:23:44 thorpej Exp $
+#      $NetBSD: Makefile,v 1.15.10.1 2000/10/18 16:42:52 tv Exp $
+
+.include <bsd.own.mk>   # For OBJECT_FMT
 
-.include <bsd.own.mk>  # For OBJECT_FMT
+.if (${OBJECT_FMT} == "a.out" || (${OBJECT_FMT} == "ELF" && \
+    (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "sparc")))
 
-.if (${OBJECT_FMT} == "a.out")
 PROG=  ldconfig
 SRCS=  ldconfig.c shlib.c
 
 CPPFLAGS += -I$(.CURDIR)/../../libexec/ld.aout_so
 .PATH: $(.CURDIR)/../../libexec/ld.aout_so
+
 .endif
 
 MAN=   ldconfig.8