Author: bdrewery
Date: Wed Oct 21 18:58:46 2015
New Revision: 289712
URL: https://svnweb.freebsd.org/changeset/base/289712
Log:
Fix my change in r289435 causing 'etc' to be added to SUBDIR when using
SUBDIR_OVERRIDE.
MFC after: 2 weeks
X-MFC-With: r289435
Sponsored by: EMC / Isilon Storage Division
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Wed Oct 21 18:52:38 2015 (r289711)
+++ head/Makefile.inc1 Wed Oct 21 18:58:46 2015 (r289712)
@@ -113,7 +113,6 @@ SUBDIR+= ${_DIR}
.warning ${_DIR} not added to SUBDIR list. See UPDATING 20141121.
.endif
.endfor
-.endif
# We must do etc/ last as it hooks into building the man whatis file
# by calling 'makedb' in share/man. This is only relevant for
@@ -124,6 +123,8 @@ SUBDIR+=.WAIT
.endif
SUBDIR+=etc
+.endif # defined(SUBDIR_OVERRIDE)
+
.if defined(NOCLEAN)
NO_CLEAN= ${NOCLEAN}
.endif
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
