Date: Sun, 9 Oct 2016 22:10:59 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306929 - in projects/doctools/cddl/usr.bin/doctools/troff: nroff troff Message-ID: <201610092210.u99MAx9v038011@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610092210.u99MAx9v038011>