From owner-svn-src-stable@freebsd.org  Tue Feb 21 02:33:30 2017
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3EE32CE746E;
 Tue, 21 Feb 2017 02:33:30 +0000 (UTC)
 (envelope-from ngie@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 mx1.freebsd.org (Postfix) with ESMTPS id 0DFD535C;
 Tue, 21 Feb 2017 02:33:29 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1L2XTRH020377;
 Tue, 21 Feb 2017 02:33:29 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1L2XTNt020376;
 Tue, 21 Feb 2017 02:33:29 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201702210233.v1L2XTNt020376@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Tue, 21 Feb 2017 02:33:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r314012 - stable/11/usr.bin/awk
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Feb 2017 02:33:30 -0000

Author: ngie
Date: Tue Feb 21 02:33:28 2017
New Revision: 314012
URL: https://svnweb.freebsd.org/changeset/base/314012

Log:
  MFC r313654:
  
  Use SRCTOP to refer to awk source in contrib/awk and remove unnecessary AWKSRC prefix
  for maketab.c
  
  The former simplifies pathing in make/displayed output, whereas the latter was just
  unnecessarily superfluous since .PATH referenced the path to maketab.c earlier on in
  the Makefile.

Modified:
  stable/11/usr.bin/awk/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/awk/Makefile
==============================================================================
--- stable/11/usr.bin/awk/Makefile	Tue Feb 21 02:30:26 2017	(r314011)
+++ stable/11/usr.bin/awk/Makefile	Tue Feb 21 02:33:28 2017	(r314012)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-AWKSRC=	${.CURDIR}/../../contrib/one-true-awk
+AWKSRC=	${SRCTOP}/contrib/one-true-awk
 .PATH: ${AWKSRC}
 
 PROG=	awk
@@ -26,6 +26,6 @@ proctab.c: maketab
 	${BTOOLSPATH:U.}/maketab > proctab.c
 
 build-tools: maketab
-maketab: ytab.h ${AWKSRC}/maketab.c ${BUILD_TOOLS_META}
+maketab: ytab.h maketab.c ${BUILD_TOOLS_META}
 
 .include <bsd.prog.mk>