From 0af99eef9e4d3c463ece2da2342499cd5b55b8ab Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Thu, 14 Feb 2013 08:32:07 +0000 Subject: [PATCH] - Fix libmd dependency. It is needed in the bootstrap library list because usr.bin/xinstall depends on it. - Remove libutil from usr.bin/xinstall/Makefile. No symbol was actually used. Reviewed by: brooks --- Makefile.inc1 | 1 + usr.bin/xinstall/Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index bcb948734ad..8a8f8cd3102 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1207,6 +1207,7 @@ bootstrap-tools: ${_sed} \ ${_yacc} \ ${_lex} \ + lib/libmd \ usr.bin/xinstall \ ${_gensnmptree} \ usr.sbin/config \ diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index d9d587302c0..773dd4ef877 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -7,10 +7,12 @@ SRCS= xinstall.c getid.c MAN= install.1 .PATH: ${.CURDIR}/../../contrib/mtree +.PATH: ${.CURDIR}/../../lib/libmd CFLAGS+= -I${.CURDIR}/../../contrib/mtree CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +CFLAGS+= -I${.CURDIR}/../../lib/libmd -DPADD+= ${LIBUTIL} ${LIBMD} -LDADD+= -lutil -lmd +DPADD+= ${LIBMD} +LDADD+= -lmd .include