From owner-svn-src-head@freebsd.org  Wed Aug 14 22:33:47 2019
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C8CEBDA5E;
 Wed, 14 Aug 2019 22:33:47 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4684B26WWBz455s;
 Wed, 14 Aug 2019 22:33:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C17DE6F46;
 Wed, 14 Aug 2019 22:33:46 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7EMXkZl052289;
 Wed, 14 Aug 2019 22:33:46 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7EMXkS6052288;
 Wed, 14 Aug 2019 22:33:46 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201908142233.x7EMXkS6052288@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Wed, 14 Aug 2019 22:33:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r351055 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: sjg
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 351055
X-SVN-Commit-Repository: base
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.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Aug 2019 22:33:47 -0000

Author: sjg
Date: Wed Aug 14 22:33:46 2019
New Revision: 351055
URL: https://svnweb.freebsd.org/changeset/base/351055

Log:
  bsd.files.mk: fix targets to avoid directories
  
  Reintroduce :T when file is used as part of a target name.
  
  Reviewed by:	stevek

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

Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk	Wed Aug 14 22:13:11 2019	(r351054)
+++ head/share/mk/bsd.files.mk	Wed Aug 14 22:33:46 2019	(r351055)
@@ -101,11 +101,11 @@ STAGE_AS_SETS+=	${file}
 STAGE_AS_${file}= ${${group}NAME_${file}}
 # XXX {group}OWN,GRP,MODE
 STAGE_DIR.${file}= ${STAGE_OBJTOP}${${_${group}DIR_${file}}}
-stage_as.${file}: ${file}
+stage_as.${file:T}: ${file}
 
 installfiles-${group}: _${group}INS1_${file}
-_${group}INS1_${file}: installdirs-${_${group}DIR_${file}} _${group}INS_${file}
-_${group}INS_${file}: ${file}
+_${group}INS1_${file:T}: installdirs-${_${group}DIR_${file}} _${group}INS_${file}
+_${group}INS_${file:T}: ${file}
 	${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${file}} \
 	    -g ${${group}GRP_${file}} -m ${${group}MODE_${file}} \
 	    ${.ALLSRC} ${${group}PREFIX_${file}}/${${group}NAME_${file}}