From owner-svn-src-projects@freebsd.org  Mon Oct 10 06:58:34 2016
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@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 7BC1CAF7129
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 10 Oct 2016 06:58:34 +0000 (UTC)
 (envelope-from bapt@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 31E40325;
 Mon, 10 Oct 2016 06:58:34 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9A6wXDQ038368;
 Mon, 10 Oct 2016 06:58:33 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9A6wXKm038364;
 Mon, 10 Oct 2016 06:58:33 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201610100658.u9A6wXKm038364@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 10 Oct 2016 06:58:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r306940 - in projects/doctools/cddl/usr.bin/doctools:
 grap ptx refer
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Oct 2016 06:58:34 -0000

Author: bapt
Date: Mon Oct 10 06:58:32 2016
New Revision: 306940
URL: https://svnweb.freebsd.org/changeset/base/306940

Log:
  Fix bootstrap in more tools

Modified:
  projects/doctools/cddl/usr.bin/doctools/grap/Makefile
  projects/doctools/cddl/usr.bin/doctools/ptx/Makefile
  projects/doctools/cddl/usr.bin/doctools/refer/Makefile

Modified: projects/doctools/cddl/usr.bin/doctools/grap/Makefile
==============================================================================
--- projects/doctools/cddl/usr.bin/doctools/grap/Makefile	Mon Oct 10 06:14:38 2016	(r306939)
+++ projects/doctools/cddl/usr.bin/doctools/grap/Makefile	Mon Oct 10 06:58:32 2016	(r306940)
@@ -19,9 +19,17 @@ FILESDIR=	${LIBDIR}
 
 CLEANFILES=	grapl.c
 
-CFLAGS=	-I. -I${DOCTOOLSDIR}/grap -DLIBDIR='"${LIBDIR}"'
 LIBADD=	m
 
+CFLAGS+=	-I. -I${DOCTOOLSDIR}/grap
+
+.if defined(WORLDTMP)
+CFLAGS+=	-DLIBDIR='"${WORLDTMP}/legacy/${LIBDIR}"'
+.else
+CFLAGS+=	-DLIBDIR='"${LIBDIR}"'
+.endif
+
+
 .include <bsd.prog.mk>
 
 .PATH:	${DOCTOOLSDIR}/grap

Modified: projects/doctools/cddl/usr.bin/doctools/ptx/Makefile
==============================================================================
--- projects/doctools/cddl/usr.bin/doctools/ptx/Makefile	Mon Oct 10 06:14:38 2016	(r306939)
+++ projects/doctools/cddl/usr.bin/doctools/ptx/Makefile	Mon Oct 10 06:58:32 2016	(r306940)
@@ -1,8 +1,13 @@
 PROG=	ptx
 
-CFLAGS=	-DLIBDIR='"${LIBDIR}"'
 FILES=	eign
 FILESDIR=	${LIBDIR}
 
+.if defined(WORLDTMP)
+CFLAGS+=	-DLIBDIR='"${WORLDTMP}/legacy/${LIBDIR}"'
+.else
+CFLAGS+=	-DLIBDIR='"${LIBDIR}"'
+.endif
+
 .include <bsd.prog.mk>
 .PATH:	${DOCTOOLSDIR}/ptx

Modified: projects/doctools/cddl/usr.bin/doctools/refer/Makefile
==============================================================================
--- projects/doctools/cddl/usr.bin/doctools/refer/Makefile	Mon Oct 10 06:14:38 2016	(r306939)
+++ projects/doctools/cddl/usr.bin/doctools/refer/Makefile	Mon Oct 10 06:58:32 2016	(r306940)
@@ -62,7 +62,11 @@ BINDIR.hunt=	${LIBDIR}/reftools
 BINDIR.inv=	${LIBDIR}/reftools
 BINDIR.mkey=	${LIBDIR}/reftools
 
-CFLAGS=	-DMACDIR='"${MACDIR}"' -DREFDIR='"${REFDIR}"'
+.if defined(WORLDTMP)
+CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' -DREFDIR='"${WORLDTMP}/legacy/${REFDIR}"'
+.else
+CFLAGS+=	-DMACDIR='"${MACDIR}"' -DREFDIR='"${REFDIR}"'
+.endif
 
 .SUFFIXES:	.sh
 .sh: