From 504e8b978bea7d257cf661b47db95362a8253bae Mon Sep 17 00:00:00 2001
From: Steven Wallace <swallace@FreeBSD.org>
Date: Sun, 18 Sep 1994 19:41:38 +0000
Subject: [PATCH] Add LDDESTDIR to ld command. Add -I${DESTDIR}/usr/include to
 cpp command.

---
 gnu/usr.bin/ld/rtld/Makefile | 8 ++++++--
 libexec/rtld-aout/Makefile   | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/usr.bin/ld/rtld/Makefile b/gnu/usr.bin/ld/rtld/Makefile
index ac6c892ec91..d8c91654e40 100644
--- a/gnu/usr.bin/ld/rtld/Makefile
+++ b/gnu/usr.bin/ld/rtld/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1994/08/26 19:11:14 wollman Exp $
+#	$Id: Makefile,v 1.12 1994/08/28 18:48:32 bde Exp $
 
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c etc.c md.c
@@ -19,9 +19,13 @@ INSTALLFLAGS+=	-fschg
 .PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
 
 $(PROG): ${OBJS} ${DPADD}
-	$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDADD)
+	$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDDESTDIR) $(LDADD)
 
 .S.o:
+.if defined(DESTDIR)
+	${CPP} -I${DESTDIR}/usr/include ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
+.else
 	${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
+.endif
 
 .include <bsd.prog.mk>
diff --git a/libexec/rtld-aout/Makefile b/libexec/rtld-aout/Makefile
index ac6c892ec91..d8c91654e40 100644
--- a/libexec/rtld-aout/Makefile
+++ b/libexec/rtld-aout/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.11 1994/08/26 19:11:14 wollman Exp $
+#	$Id: Makefile,v 1.12 1994/08/28 18:48:32 bde Exp $
 
 PROG=	ld.so
 SRCS=	mdprologue.S rtld.c malloc.c shlib.c etc.c md.c
@@ -19,9 +19,13 @@ INSTALLFLAGS+=	-fschg
 .PATH: $(LDDIR) $(LDDIR)/$(MACHINE)
 
 $(PROG): ${OBJS} ${DPADD}
-	$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDADD)
+	$(LD) -o $(PROG) $(LDFLAGS) $(OBJS) $(LDDESTDIR) $(LDADD)
 
 .S.o:
+.if defined(DESTDIR)
+	${CPP} -I${DESTDIR}/usr/include ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
+.else
 	${CPP} ${.IMPSRC} | ${AS} ${ASFLAGS} -o ${.TARGET} -
+.endif
 
 .include <bsd.prog.mk>