From 36f2d901ea90cafb0ba8d3d09d6082480f6acee7 Mon Sep 17 00:00:00 2001
From: brooks <brooks@FreeBSD.org>
Date: Mon, 24 Apr 2017 21:31:27 +0000
Subject: [PATCH] Clean up Makefile.

Prefer SRCTOP vs .CURDIR relative paths.

Find libnetbsd using LIBADD infrastructure rather than manual hackery.

Reviewed by:	ngie, bapt
Obtained from:	CheriBSD
MFC after:	1 week
Sponsored by:	DARPA, AFRL
Differential Revision:	https://reviews.freebsd.org/D10461
---
 usr.bin/getaddrinfo/Makefile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/usr.bin/getaddrinfo/Makefile b/usr.bin/getaddrinfo/Makefile
index 6efb164c2f95..ced8c9e725b7 100644
--- a/usr.bin/getaddrinfo/Makefile
+++ b/usr.bin/getaddrinfo/Makefile
@@ -3,19 +3,15 @@
 .include <bsd.own.mk>
 
 PROG=	getaddrinfo
+SRCS=	getaddrinfo.c tables.h
 
-CFLAGS+=	-I${.CURDIR}/../../lib/libnetbsd
-LIBNETBSDDIR=	${.OBJDIR}/../../lib/libnetbsd
-LIBNETBSD=	${LIBNETBSDDIR}/libnetbsd.a
-DPADD+=		${LIBNETBSD}
-LDADD+=		${LIBNETBSD}
+CFLAGS+=	-I${SRCTOP}/lib/libnetbsd
 
-LIBADD+=	util
+LIBADD+=	netbsd util
 
-SYS_SOCKET_H?=	${.CURDIR}/../../sys/sys/socket.h
+SYS_SOCKET_H?=	${SRCTOP}/sys/sys/socket.h
 
-CFLAGS+=	-I.
-DPSRCS+=	tables.h
+CFLAGS+=	-I${.OBJDIR}
 CLEANFILES+=	tables.h
 tables.h: tables.awk ${SYS_SOCKET_H}
 	LC_ALL=C awk -f ${.ALLSRC} > ${.TARGET}