summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2013-02-14 08:32:07 +0000
committerhrs <hrs@FreeBSD.org>2013-02-14 08:32:07 +0000
commitaf9a6b59013c48aa503513ce55d93fe84817996a (patch)
treec2583c9ae8e9c3015fefef75ac0c2e5026ab3283
parent8426ce9b0af88e9ddadfb8a5ed2ae5f188d6d148 (diff)
downloadFreeBSD-src-af9a6b59013c48aa503513ce55d93fe84817996a.zip
FreeBSD-src-af9a6b59013c48aa503513ce55d93fe84817996a.tar.gz
- 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
-rw-r--r--Makefile.inc11
-rw-r--r--usr.bin/xinstall/Makefile6
2 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index bcb9487..8a8f8cd 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 d9d5873..773dd4e 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 <bsd.prog.mk>
OpenPOWER on IntegriCloud