From owner-svn-src-head@FreeBSD.ORG  Mon May 19 19:08:47 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 64660F60;
 Mon, 19 May 2014 19:08:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 51ED62BC3;
 Mon, 19 May 2014 19:08:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JJ8lLc061822;
 Mon, 19 May 2014 19:08:47 GMT (envelope-from sjg@svn.freebsd.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JJ8llK061821;
 Mon, 19 May 2014 19:08:47 GMT (envelope-from sjg@svn.freebsd.org)
Message-Id: <201405191908.s4JJ8llK061821@svn.freebsd.org>
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Mon, 19 May 2014 19:08:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266450 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2014 19:08:47 -0000

Author: sjg
Date: Mon May 19 19:08:46 2014
New Revision: 266450
URL: http://svnweb.freebsd.org/changeset/base/266450

Log:
  _SUBDIR is marked .MAKE - since it runs a sub-make.
  Targets thus marked are supposed to run even with -n.
  As such they should not do anything except run the sub-make.
  
  Use an intermediate target _* to associate with _SUBDIR and which
  depends on installincludes etc so that we get the correct behavior with -n.
  
  Reviewed by:	marcel

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

Modified: head/share/mk/bsd.subdir.mk
==============================================================================
--- head/share/mk/bsd.subdir.mk	Mon May 19 18:07:37 2014	(r266449)
+++ head/share/mk/bsd.subdir.mk	Mon May 19 19:08:46 2014	(r266450)
@@ -104,8 +104,9 @@ ${__target}: _SUBDIR
 .for __target in files includes
 .for __stage in build install
 ${__stage}${__target}:
+_${__stage}${__target}: ${__stage}${__target}
 .if make(${__stage}${__target})
-${__stage}${__target}: _SUBDIR
+_${__stage}${__target}: _SUBDIR
 .endif
 .endfor
 ${__target}: .MAKE