From 3ed076289c586f24ba08dfad9f55a732680ccaac Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Wed, 5 Oct 2016 21:40:01 +0000
Subject: [PATCH] conditionally create obj & xobj same way that src is handled
 ok natano

---
 src/etc/Makefile          | 8 +++++++-
 src/etc/mtree/4.4BSD.dist | 8 +-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index 22ec0e1a..ee20368d 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.436 2016/10/05 18:00:41 natano Exp $
+#	$OpenBSD: Makefile,v 1.437 2016/10/05 21:39:57 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -232,6 +232,12 @@ distrib-dirs:
 	if [ ! -d ${DESTDIR}/usr/src ]; then \
 		${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/src; \
 	fi
+	if [ ! -d ${DESTDIR}/usr/obj ]; then \
+		${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/obj; \
+	fi
+	if [ ! -d ${DESTDIR}/usr/xobj ]; then \
+		${INSTALL} -d -o root -g wsrc -m 775 ${DESTDIR}/usr/xobj; \
+	fi
 	cd ${DESTDIR}/; ln -fhs usr/src/sys sys
 	chown -h root:wheel ${DESTDIR}/sys
 
diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index 6fb1f79a..7ec937b8 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.290 2016/09/27 20:18:34 rpe Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.291 2016/10/05 21:40:01 deraadt Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 
@@ -416,8 +416,6 @@ usr
     # ./usr/mdec
     mdec
     ..
-    obj				gname=wsrc mode=0775
-    ..
     sbin
     ..
 
@@ -592,10 +590,6 @@ usr
             ..
         ..
    ..
-
-   # ./usr/xobj
-   xobj				gname=wsrc mode=0775
-   ..
 ..
 
 # ./var