Look for files in their new locations.

gnu/usr.bin/ld/Makefile

@@ -1,21 +1,17 @@
-# $Id: Makefile,v 1.22 1997/06/29 21:36:33 bde Exp $
+# $Id: Makefile,v 1.23 1998/05/25 17:34:37 sos Exp $
 #
 
+RTLD=	${.CURDIR}/../../../libexec/rtld-aout
+GCCDIR=	${.CURDIR}/../../../contrib/gcc
+
 PROG=	ld
 BINDIR= /usr/libexec/aout
 SRCS=	ld.c symbol.c lib.c shlib.c warnings.c support.c rrs.c xbits.c md.c \
 	cplus-dem.c
-CFLAGS+= -I$(.CURDIR) -I$(.CURDIR)/$(MACHINE) \
-	-I$(GCCDIR) -DIN_GCC -DDEMANGLE_CPLUSPLUS
+CFLAGS+= -I${.CURDIR} -I${RTLD} -I${RTLD}/${MACHINE} \
+	-I${GCCDIR} -DIN_GCC -DDEMANGLE_CPLUSPLUS
 NOSHARED?= yes
 
-GCCDIR=	${.CURDIR}/../../../contrib/gcc
-
-SUBDIR=       ldconfig ldd
-.if !defined(NOPIC)
-SUBDIR+= rtld
-.endif
-
-.PATH: $(.CURDIR)/$(MACHINE) $(GCCDIR)
+.PATH: ${RTLD} ${RTLD}/${MACHINE} ${GCCDIR}
 
 .include <bsd.prog.mk>