From owner-svn-src-all@FreeBSD.ORG  Tue Feb 24 19:27:52 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 7EC384FD;
 Tue, 24 Feb 2015 19:27:52 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6ACEAAB5;
 Tue, 24 Feb 2015 19:27:52 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1OJRqYd085825;
 Tue, 24 Feb 2015 19:27:52 GMT (envelope-from emaste@FreeBSD.org)
Received: (from emaste@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1OJRqYt085824;
 Tue, 24 Feb 2015 19:27:52 GMT (envelope-from emaste@FreeBSD.org)
Message-Id: <201502241927.t1OJRqYt085824@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: emaste set sender to
 emaste@FreeBSD.org using -f
From: Ed Maste <emaste@FreeBSD.org>
Date: Tue, 24 Feb 2015 19:27:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279248 - head/etc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2015 19:27:52 -0000

Author: emaste
Date: Tue Feb 24 19:27:51 2015
New Revision: 279248
URL: https://svnweb.freebsd.org/changeset/base/279248

Log:
  Unconditionally install debug directory hierarchy
  
  This avoids various failure modes (e.g., when building and installing a
  single binary with debug data on a system that otherwise does not have
  it enabled).
  
  It is also consistent with the way other directory hierarchies are
  handled (e.g. share/man).
  
  Reviewed by:	imp
  Differential Revision:	https://reviews.freebsd.org/D1962

Modified:
  head/etc/Makefile

Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile	Tue Feb 24 19:03:31 2015	(r279247)
+++ head/etc/Makefile	Tue Feb 24 19:27:51 2015	(r279248)
@@ -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