diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-10-23 18:07:07 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-10-23 18:07:07 +0000 |
| commit | 817f3323c4ae6c5685c1bde18aeac92153ab3fd5 (patch) | |
| tree | 47e4fd285018bf253ae3123264842b80717aed61 /usr.sbin | |
| parent | caa64dbe94775328829119d3737c0b4e2bbd543c (diff) | |
| download | FreeBSD-src-817f3323c4ae6c5685c1bde18aeac92153ab3fd5.zip FreeBSD-src-817f3323c4ae6c5685c1bde18aeac92153ab3fd5.tar.gz | |
MFC r256450:
Rename libbsdyml to libyaml, make private, and bump
SHLIB_MAJOR to 1.0
Approved by: bapt
Approved by: re (glebius)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pkg/Makefile | 7 | ||||
| -rw-r--r-- | usr.sbin/pkg/config.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index d244bd2..38d82ba 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -4,7 +4,10 @@ PROG= pkg SRCS= pkg.c dns_utils.c config.c NO_MAN= yes -DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBBSDYML} ${LIBSBUF} -LDADD= -larchive -lelf -lfetch -lbsdyml -lsbuf +CFLAGS+=-I${.CURDIR}/../../contrib/libyaml/include +.PATH: ${.CURDIR}/../../contrib/libyaml/include +DPADD= ${LIBARCHIVE} ${LIBELF} ${LIBFETCH} ${LIBYAML} ${LIBSBUF} +LDADD= -larchive -lelf -lfetch -lyaml -lsbuf +USEPRIVATELIB= yaml .include <bsd.prog.mk> diff --git a/usr.sbin/pkg/config.c b/usr.sbin/pkg/config.c index 01eaa9f..429aad6 100644 --- a/usr.sbin/pkg/config.c +++ b/usr.sbin/pkg/config.c @@ -33,7 +33,7 @@ __FBSDID("$FreeBSD$"); #include <sys/endian.h> #include <assert.h> -#include <bsdyml.h> +#include <yaml.h> #include <ctype.h> #include <err.h> #include <errno.h> |
