diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2015-02-26 07:26:56 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2015-02-26 07:26:56 +0000 |
| commit | 0d56a8cba1d02f356533002422fc778b4fc14e06 (patch) | |
| tree | bedc824cb11ed7551f9ae51a902f5921c0abf14f /etc | |
| parent | cef93a3d5291efd5b22b9b69f9b5305b9cdbe259 (diff) | |
| parent | a0f4b91bed84b60324957f3efe1acabf636c5b3f (diff) | |
| download | src-0d56a8cba1d02f356533002422fc778b4fc14e06.tar.gz src-0d56a8cba1d02f356533002422fc778b4fc14e06.zip | |
Merge ^/head r279163 through r279308.
Notes
Notes:
svn path=/projects/clang360-import/; revision=279309
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/etc/Makefile b/etc/Makefile index 79ffb99bd5e4..b714af52e52b 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -158,16 +158,13 @@ BIN1+= regdomain.xml # -rwxr-xr-x root:wheel, for the new cron root:wheel BIN2= netstart pccard_ether rc.suspend rc.resume -MTREE= BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist +MTREE= BSD.debug.dist BSD.include.dist BSD.root.dist BSD.usr.dist BSD.var.dist .if ${MK_TESTS} != "no" MTREE+= BSD.tests.dist .endif .if ${MK_SENDMAIL} != "no" MTREE+= BSD.sendmail.dist .endif -.if ${MK_DEBUG_FILES} != "no" -MTREE+= BSD.debug.dist -.endif PPPCNF= ppp.conf @@ -346,10 +343,8 @@ MTREE_CMD?= mtree MTREES= mtree/BSD.root.dist / \ mtree/BSD.var.dist /var \ mtree/BSD.usr.dist /usr \ - mtree/BSD.include.dist /usr/include -.if ${MK_DEBUG_FILES} != "no" -MTREES+= mtree/BSD.debug.dist /usr/lib -.endif + mtree/BSD.include.dist /usr/include \ + mtree/BSD.debug.dist /usr/lib .if ${MK_GROFF} != "no" MTREES+= mtree/BSD.groff.dist /usr .endif |