From 42decb4196d2d0af1dc30de19916662ce3e6538c Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Mon, 1 Jun 1998 13:00:32 +0000
Subject: [PATCH] Seperate the Paul Kranenburg a.out rtld stuff into a
 stand-alone area away from the gpl ld code.  This is part 2 of something that
 I began in 1996. A repository copy has happened behind cvs's back.

---
 libexec/rtld-aout/Makefile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index 13c8de84dca6..305eca1c6a35 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,19 +1,17 @@
-#	$Id: Makefile,v 1.24 1997/04/16 11:31:32 bde Exp $
+#	$Id: Makefile,v 1.25 1997/11/29 03:32:46 jdp Exp $
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c shlib.c md.c support.c
 MAN1=	rtld.1
-LDDIR?= $(.CURDIR)/..
 # As there is relocation going on behind GCC's back, don't cache function addresses.
 PICFLAG=-fpic -fno-function-cse
-CFLAGS+=-I$(LDDIR) -I$(.CURDIR) -I$(LDDIR)/$(MACHINE) $(PICFLAG) -DRTLD -Wall
+CFLAGS+=-I${.CURDIR} -I${.CURDIR}/${MACHINE} ${PICFLAG} -DRTLD -Wall
 LDFLAGS+=-nostdlib -Wl,-Bshareable,-Bsymbolic,-assert,nosymbolic
 ASFLAGS+=-k
 DPADD+=	${LIBC:S/c.a/c_pic.a/} ${LIBC:S/c.a/gcc_pic.a/}
 LDADD+=	-lc_pic -lgcc_pic
-BINDIR= /usr/libexec
 INSTALLFLAGS+=	-fschg -C	# -C to install as atomically as possible
 MLINKS= rtld.1 ld.so.1
 
-.PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
+.PATH: ${.CURDIR}/${MACHINE}
 
 .include <bsd.prog.mk>