From 2a5b8c6a08683f9a319bacacf419e81ede345f9a Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Sat, 22 Aug 1998 19:03:46 +0000
Subject: [PATCH] Pull BFD includes and libs from the right place.  (Needs more
 cleanup.)

---
 gnu/usr.bin/binutils/Makefile.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 93f318d78fc8..50a650c4da09 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.3 1998/07/25 18:58:42 tv Exp $
+#	$NetBSD: Makefile.inc,v 1.4 1998/08/22 19:03:46 tv Exp $
 
 .if !defined(__MAKEFILE_INC_INCLUDED__)
 __MAKEFILE_INC_INCLUDED__=1
@@ -6,6 +6,8 @@ __MAKEFILE_INC_INCLUDED__=1
 TOP=	${.CURDIR}/../../..
 dist=	${TOP}/dist
 srcdir=	${dist}/binutils
+BFDOBJ!=cd ${TOP}/lib/bfd; \
+	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
 
 .PATH:	${srcdir}
 
@@ -27,7 +29,7 @@ TARGET=${TARGET_ARCH}-unknown-netbsd
 
 INCLS+=	-I${.OBJDIR} -I${.CURDIR} -I${.CURDIR}/../common
 
-INCLS+=	-I${TOP}/lib/bfd
+INCLS+=	-I${BFDOBJ}
 INCLS+=	-I${dist}/bfd
 INCLS+=	-I${dist}/binutils
 INCLS+=	-I${dist}/include
@@ -39,8 +41,8 @@ LIBCOMMONDIR != cd ${.CURDIR}/../common; \
 LIBCOMMON= ${LIBCOMMONDIR}/libcommon.a
 COMMONLIB= -L${LIBCOMMONDIR} -lcommon
 
-DPADD=	${LIBCOMMON} ${LIBBFD}
-LDADD=	${COMMONLIB} -lbfd
+DPADD=	${LIBCOMMON} ${BFDOBJ}/libbfd.a
+LDADD=	${COMMONLIB} -L${BFDOBJ} -lbfd
 
 .if exists(${.CURDIR}/../../Makefile.inc)
 .include "${.CURDIR}/../../Makefile.inc"