svn commit: r298413 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Apr 21 16:12:55 2016
New Revision: 298413
URL: https://svnweb.freebsd.org/changeset/base/298413

Log:
  Follow-up r298219: Don't error with 'make all install'.
  
  Reported by:	kib
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.sys.mk

Modified: head/share/mk/bsd.sys.mk
==============================================================================
--- head/share/mk/bsd.sys.mk	Thu Apr 21 16:04:58 2016	(r298412)
+++ head/share/mk/bsd.sys.mk	Thu Apr 21 16:12:55 2016	(r298413)
@@ -180,7 +180,7 @@ CXXFLAGS+=	${CXXFLAGS.${.IMPSRC:T}}
 
 .if defined(SRCTOP)
 # Prevent rebuilding during install to support read-only objdirs.
-.if make(install) && empty(.MAKE.MODE:Mmeta)
+.if !make(all) && make(install) && empty(.MAKE.MODE:Mmeta)
 CFLAGS+=	ERROR-tried-to-rebuild-during-make-install
 .endif
 .endif