diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-10-14 18:31:15 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-10-14 18:31:15 +0000 |
| commit | ae7fa1acd1316044df859e20bad035b5d6583874 (patch) | |
| tree | 3698b019f785a221127f30af9ea27b156fed6f67 /usr.sbin | |
| parent | 7a70d69a08a5f4ff9895f70f638ff44cf2b4c81a (diff) | |
| download | FreeBSD-src-ae7fa1acd1316044df859e20bad035b5d6583874.zip FreeBSD-src-ae7fa1acd1316044df859e20bad035b5d6583874.tar.gz | |
Rename libbsdyml to libyaml, make private, and bump
SHLIB_MAJOR to 1.0
Suggested by: des
Approved by: bapt
MFC after: 1 week
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> |
