Index: share/mk/bsd.confs.mk
===================================================================
--- share/mk/bsd.confs.mk
+++ share/mk/bsd.confs.mk
@@ -96,11 +96,7 @@
 _DIRS+=	${${d}}
 .        endfor
 .        if ${DIRS:M${_${group}DIR_${cnf}}} == ""
-.          if ${_DIRS:M${${_${group}DIR_${cnf}}}} == ""
 DIRS+=	${_${group}DIR_${cnf}}
-.          else
-_${group}DIR_${cnf}=	${group}DIR
-.          endif
 .        endif
 
 .        if defined(${group}NAME)
Index: share/mk/bsd.files.mk
===================================================================
--- share/mk/bsd.files.mk
+++ share/mk/bsd.files.mk
@@ -89,11 +89,7 @@
 _DIRS+=	${${d}}
 .endfor
 .if ${DIRS:M${_${group}DIR_${file}}} == ""
-.if ${_DIRS:M${${_${group}DIR_${file}}}} == ""
 DIRS+=	${_${group}DIR_${file}}
-.else
-_${group}DIR_${file}=	${group}DIR
-.endif
 .endif
 
 .if defined(${group}NAME)