diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-09-28 23:54:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-09-28 23:54:04 +0000 |
| commit | 5abfe1c1961e66f07fb81836d46472d3f25e9f21 (patch) | |
| tree | 83970f00c4862e59244914a0802e630a49bc0415 /gnu/usr.bin | |
| parent | 3fe6c05ce250c4d8dc3d85b1cbd895db85761d37 (diff) | |
enter rtld, to install the man page at least
Diffstat (limited to 'gnu/usr.bin')
| -rw-r--r-- | gnu/usr.bin/ld/Makefile | 7 | ||||
| -rw-r--r-- | gnu/usr.bin/ld/rtld/Makefile | 15 |
2 files changed, 14 insertions, 8 deletions
diff --git a/gnu/usr.bin/ld/Makefile b/gnu/usr.bin/ld/Makefile index 8bcc4442975..57daf33b27d 100644 --- a/gnu/usr.bin/ld/Makefile +++ b/gnu/usr.bin/ld/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2005/09/12 20:04:50 miod Exp $ +# $OpenBSD: Makefile,v 1.13 2005/09/28 23:54:03 deraadt Exp $ # $NetBSD: Makefile,v 1.13 1995/04/23 07:58:46 cgd Exp $ TARGET_MACHINE_ARCH?= $(MACHINE_ARCH) @@ -27,12 +27,9 @@ beforedepend: ln -sf ${.CURDIR}/../../../sys/arch/${TARGET}/include \ cross-include/machine .else -SUBDIR= ldconfig ldd +SUBDIR= ldconfig ldd rtld .endif .PATH: $(.CURDIR)/$(TARGET_MACHINE_ARCH) .include <bsd.prog.mk> -.if !defined(NOPIC) && ($(TARGET_MACHINE_ARCH) == $(MACHINE_ARCH)) -SUBDIR+= rtld -.endif diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile index 6615172747e..4ba617dc6cd 100644 --- a/gnu/usr.bin/ld/rtld/Makefile +++ b/gnu/usr.bin/ld/rtld/Makefile @@ -1,10 +1,13 @@ -# $OpenBSD: Makefile,v 1.8 2002/12/12 09:54:46 markus Exp $ +# $OpenBSD: Makefile,v 1.9 2005/09/28 23:54:03 deraadt Exp $ # $NetBSD: Makefile,v 1.11 1995/10/09 00:11:24 pk Exp $ +.include <bsd.own.mk> + +TARGET_MACHINE_ARCH?= $(MACHINE_ARCH) + +.if !defined(NOPIC) && ($(TARGET_MACHINE_ARCH) == $(MACHINE_ARCH)) PROG= ld.so SRCS= mdprologue.S rtld.c malloc.c shlib.c etc.c md.c vfprintf.c -#NOMAN= noman -MAN= ld.so.1 LDDIR?= $(.CURDIR)/.. LIBCRT0= #PICFLAG=-pic @@ -17,6 +20,12 @@ DPADD+= ${LIBC} LDADD+= -lc_pic BINDIR= /usr/libexec +.else +NOPROG= +.endif + +MAN= ld.so.1 + .PATH: $(LDDIR) $(LDDIR)/$(MACHINE_ARCH) ${.CURDIR}/../../../../lib/libc/stdio .S.o: |