From owner-svn-src-projects@freebsd.org  Sun Oct  9 22:11:00 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 6314AC0B940
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Sun,  9 Oct 2016 22:11:00 +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 17946329;
 Sun,  9 Oct 2016 22:11:00 +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 u99MAxGa038013;
 Sun, 9 Oct 2016 22:10:59 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u99MAx9v038011;
 Sun, 9 Oct 2016 22:10:59 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201610092210.u99MAx9v038011@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: Sun, 9 Oct 2016 22:10:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r306929 - in
 projects/doctools/cddl/usr.bin/doctools/troff: nroff troff
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: Sun, 09 Oct 2016 22:11:00 -0000

Author: bapt
Date: Sun Oct  9 22:10:58 2016
New Revision: 306929
URL: https://svnweb.freebsd.org/changeset/base/306929

Log:
  Fix bootstrapping doctools

Modified:
  projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile
  projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile

Modified: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile
==============================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile	Sun Oct  9 21:47:20 2016	(r306928)
+++ projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile	Sun Oct  9 22:10:58 2016	(r306929)
@@ -32,12 +32,19 @@ LDADD=	${.OBJDIR}/../libhnj/libhnj.a
 
 CFLAGS+=	-I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/nroff.d \
 		-I${DOCTOOLSDIR}/troff/ -DSHELL='"/bin/sh"' \
-		-DMACDIR='"${MACDIR}"' \
 		-DRELEASE='"${RELEASE}"' \
+		-DNROFF -DUSG -DEUC
+.if defined(WORLDTMP)
+CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' \
+		-DHYPDIR='"${WORLDTMP}/legacy/${HYPDIR}"' \
+		-DFNTDIR='"${WORLDTMP}/legacy/${FNTDIR}"' \
+		-DTABDIR='"${WORLDTMP}/legacy/${TABDIR}"'
+.else
+CFLAGS+=	-DMACDIR='"${MACDIR}"' \
 		-DHYPDIR='"${HYPDIR}"' \
 		-DFNTDIR='"${FNTDIR}"' \
-		-DTABDIR='"${TABDIR}"' \
-		-DNROFF -DUSG -DEUC
+		-DTABDIR='"${TABDIR}"'
+.endif
 
 NLTERM=		${DOCTOOLSDIR}/troff/nroff.d/terms.d
 

Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile
==============================================================================
--- projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	Sun Oct  9 21:47:20 2016	(r306928)
+++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile	Sun Oct  9 22:10:58 2016	(r306929)
@@ -53,12 +53,21 @@ CFLAGS.dhtml+=	-I${DOCTOOLSDIR}/troff/tr
 
 CFLAGS+=	-I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/troff.d \
 		-I${DOCTOOLSDIR}/troff/ -DSHELL='"/bin/sh"' \
-		-DMACDIR='"${MACDIR}"' \
-		-DRELEASE='"${RELEASE}"' \
+		-DRELEASE='"${RELEASE}"'
+
+.if defined(WORLDTMP)
+CFLAGS+=	-DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' \
+		-DHYPDIR='"${WORLDTMP}/legacy/${HYPDIR}"' \
+		-DFNTDIR='"${WORLDTMP}/legacy/${FNTDIR}"' \
+		-DTABDIR='"${WORLDTMP}/legacy/${TABDIR}"' \
+		-DPSTDIR='"${WORLDTMP}/legacy/${PSTDIR}"'
+.else
+CFLAGS+=	-DMACDIR='"${MACDIR}"' \
 		-DHYPDIR='"${HYPDIR}"' \
 		-DFNTDIR='"${FNTDIR}"' \
 		-DTABDIR='"${TABDIR}"' \
-		-DPSTDIR='"${PSTDIR}"' \
+		-DPSTDIR='"${PSTDIR}"'
+.endif
 
 .include <bsd.progs.mk>