diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-03-03 23:15:46 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-03-03 23:15:46 +0000 |
| commit | 82aa34e6fa1cd5a4ad401383522daf51412ea4b2 (patch) | |
| tree | 933ca1d4eee78dcba4bd7cb9578fbf354cd90bbb /Makefile.inc1 | |
| parent | ada554fc20020766e79f991c0412c66e0604e427 (diff) | |
| parent | d7acb49aeeaef0a35b05869bd8345c4b8c7c7481 (diff) | |
| download | src-82aa34e6fa1cd5a4ad401383522daf51412ea4b2.tar.gz src-82aa34e6fa1cd5a4ad401383522daf51412ea4b2.zip | |
Merge ^/head r296007 through r296368.
Notes
Notes:
svn path=/projects/clang380-import/; revision=296369
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index a2d33066182a..96db498b5951 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -585,7 +585,7 @@ _worldtmp: .PHONY rm -f ${OBJTREE}${.CURDIR}/usr.bin/kdump/kdump_subr.c .endif .for _dir in \ - lib usr legacy/bin legacy/usr + lib lib/casper usr legacy/bin legacy/usr mkdir -p ${WORLDTMP}/${_dir} .endfor mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ @@ -1870,7 +1870,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libfigpar \ ${_lib_libgssapi} \ lib/libkiconv lib/libkvm lib/liblzma lib/libmd lib/libnv \ - ${_lib_libcapsicum} \ + ${_lib_casper} \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ ${_lib_libradius} lib/libsbuf lib/libtacplus \ @@ -1910,11 +1910,11 @@ _ofed_lib= contrib/ofed/usr.lib/ .endif .if ${MK_CASPER} != "no" -_lib_libcapsicum=lib/libcapsicum +_lib_casper= lib/libcasper .endif -lib/libcapsicum__L: lib/libnv__L lib/libpjdlog__L: lib/libutil__L +lib/libcasper__L: lib/libnv__L lib/liblzma__L: lib/libthr__L _generic_libs= ${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib ${_ofed_lib} |