From owner-svn-src-head@freebsd.org  Wed Mar  8 05:31:56 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 304B5D02276;
 Wed,  8 Mar 2017 05:31:56 +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 D7F5B102F;
 Wed,  8 Mar 2017 05:31:55 +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 v285VsU2065054;
 Wed, 8 Mar 2017 05:31:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v285Vs1Y065051;
 Wed, 8 Mar 2017 05:31:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201703080531.v285Vs1Y065051@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: Wed, 8 Mar 2017 05:31:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r314893 - in head/usr.bin/fortune: . datfiles fortune
 unstr
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.23
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, 08 Mar 2017 05:31:56 -0000

Author: ngie
Date: Wed Mar  8 05:31:54 2017
New Revision: 314893
URL: https://svnweb.freebsd.org/changeset/base/314893

Log:
  usr.bin/fortune: convert to OBJTOP/SRCTOP idioms
  
  - Use OBJTOP/SRCTOP-relative paths when looking for include files and
    strfile.
  - Add FORTUNES_OBJ and FORTUNES_SRC to abbreviate usr.bin/fortune
    pathing.
  
  This is being done to simplify make output/idioms.
  
  MFC after:	1 week
  Reviewed by:	bdrewery
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	D9916

Modified:
  head/usr.bin/fortune/Makefile.inc
  head/usr.bin/fortune/datfiles/Makefile
  head/usr.bin/fortune/fortune/Makefile
  head/usr.bin/fortune/unstr/Makefile

Modified: head/usr.bin/fortune/Makefile.inc
==============================================================================
--- head/usr.bin/fortune/Makefile.inc	Wed Mar  8 05:27:04 2017	(r314892)
+++ head/usr.bin/fortune/Makefile.inc	Wed Mar  8 05:31:54 2017	(r314893)
@@ -1,3 +1,6 @@
-.if exists(${.CURDIR}/../../Makefile.inc)
-.include "${.CURDIR}/../../Makefile.inc"  
-.endif
+# $FreeBSD$
+
+FORTUNE_SRC=	${SRCTOP}/usr.bin/fortune
+FORTUNE_OBJ=	${OBJTOP}/usr.bin/fortune
+
+.include "${SRCTOP}/usr.bin/Makefile.inc"

Modified: head/usr.bin/fortune/datfiles/Makefile
==============================================================================
--- head/usr.bin/fortune/datfiles/Makefile	Wed Mar  8 05:27:04 2017	(r314892)
+++ head/usr.bin/fortune/datfiles/Makefile	Wed Mar  8 05:31:54 2017	(r314893)
@@ -15,7 +15,7 @@ FILESDIR=	${SHAREDIR}/games/fortune
 
 .for f in ${DB}
 $f.dat: $f
-	PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \
+	PATH=$$PATH:/usr/bin:${FORTUNE_OBJ}/strfile \
 	    strfile -Cs ${.ALLSRC} ${.TARGET}
 .endfor
 

Modified: head/usr.bin/fortune/fortune/Makefile
==============================================================================
--- head/usr.bin/fortune/fortune/Makefile	Wed Mar  8 05:27:04 2017	(r314892)
+++ head/usr.bin/fortune/fortune/Makefile	Wed Mar  8 05:31:54 2017	(r314893)
@@ -3,7 +3,7 @@
 
 PROG=	fortune
 MAN=	fortune.6
-CFLAGS+=-DDEBUG -I${.CURDIR}/../strfile
+CFLAGS+=-DDEBUG -I${FORTUNE_SRC}/strfile
 
 .include <bsd.prog.mk>
 

Modified: head/usr.bin/fortune/unstr/Makefile
==============================================================================
--- head/usr.bin/fortune/unstr/Makefile	Wed Mar  8 05:27:04 2017	(r314892)
+++ head/usr.bin/fortune/unstr/Makefile	Wed Mar  8 05:31:54 2017	(r314893)
@@ -3,6 +3,6 @@
 
 PROG=	unstr
 MAN=
-CFLAGS+= -I${.CURDIR}/../strfile
+CFLAGS+= -I${FORTUNE_SRC}/strfile
 
 .include <bsd.prog.mk>