Author: emaste
Date: Thu Sep 24 20:56:26 2015
New Revision: 288192
URL: https://svnweb.freebsd.org/changeset/base/288192

Log:
  MFC r279248: 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).

Modified:
  stable/10/etc/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/etc/Makefile
==============================================================================
--- stable/10/etc/Makefile      Thu Sep 24 20:03:00 2015        (r288191)
+++ stable/10/etc/Makefile      Thu Sep 24 20:56:26 2015        (r288192)
@@ -154,16 +154,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
 
@@ -336,10 +333,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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to