Date: Mon, 10 Oct 2016 20:48:21 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r307005 - in projects/doctools/cddl/usr.bin/doctools: . grap ptx refer tbl troff/nroff troff/troff troff/troff/tmac Message-ID: <201610102048.u9AKmLdv064160@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Mon Oct 10 20:48:21 2016 New Revision: 307005 URL: https://svnweb.freebsd.org/changeset/base/307005 Log: Define a generic WORLDTMPDIR (for now only doc doctools) Fix tmac files during bootstrap Modified: projects/doctools/cddl/usr.bin/doctools/Makefile.inc projects/doctools/cddl/usr.bin/doctools/grap/Makefile projects/doctools/cddl/usr.bin/doctools/ptx/Makefile projects/doctools/cddl/usr.bin/doctools/refer/Makefile projects/doctools/cddl/usr.bin/doctools/tbl/Makefile projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile Modified: projects/doctools/cddl/usr.bin/doctools/Makefile.inc ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/Makefile.inc Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/Makefile.inc Mon Oct 10 20:48:21 2016 (r307005) @@ -10,4 +10,7 @@ MACDIR= ${DTSHAREDIR}/tmac PSTDIR= ${DTSHAREDIR}/devpost/postscript PUBDIR= ${DTSHAREDIR}/pub TABDIR= ${DTSHAREDIR}/nterm +.if defined(WORLDTMP) +WORLDTMPDIR= ${WORLDTMP}/legacy +.endif .include "../Makefile.inc" Modified: projects/doctools/cddl/usr.bin/doctools/grap/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/grap/Makefile Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/grap/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -23,11 +23,7 @@ LIBADD= m CFLAGS+= -I. -I${DOCTOOLSDIR}/grap -.if defined(WORLDTMP) -CFLAGS+= -DLIBDIR='"${WORLDTMP}/legacy/${LIBDIR}"' -.else -CFLAGS+= -DLIBDIR='"${LIBDIR}"' -.endif +CFLAGS+= -DLIBDIR='"${WORLDTMPDIR}${LIBDIR}"' .include <bsd.prog.mk> Modified: projects/doctools/cddl/usr.bin/doctools/ptx/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/ptx/Makefile Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/ptx/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -3,11 +3,7 @@ PROG= ptx FILES= eign FILESDIR= ${LIBDIR} -.if defined(WORLDTMP) -CFLAGS+= -DLIBDIR='"${WORLDTMP}/legacy/${LIBDIR}"' -.else -CFLAGS+= -DLIBDIR='"${LIBDIR}"' -.endif +CFLAGS+= -DLIBDIR='"${WORLDTMPDIR}${LIBDIR}"' .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 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/refer/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -62,11 +62,7 @@ BINDIR.hunt= ${LIBDIR}/reftools BINDIR.inv= ${LIBDIR}/reftools BINDIR.mkey= ${LIBDIR}/reftools -.if defined(WORLDTMP) -CFLAGS+= -DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' -DREFDIR='"${WORLDTMP}/legacy/${REFDIR}"' -.else -CFLAGS+= -DMACDIR='"${MACDIR}"' -DREFDIR='"${REFDIR}"' -.endif +CFLAGS+= -DMACDIR='"${WORLDTMPDIR}${MACDIR}"' -DREFDIR='"${WORLDTMPDIR}${REFDIR}"' .SUFFIXES: .sh .sh: Modified: projects/doctools/cddl/usr.bin/doctools/tbl/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/tbl/Makefile Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/tbl/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -21,11 +21,7 @@ SRCS= t0.c \ tu.c \ tv.c -.if defined(WORLDTMP) -CFLAGS+= -DMACDIR='"${WORLDTMP}/legacy/${MACDIR}"' -.else -CFLAGS+= -DMACDIR='"${MACDIR}"' -.endif +CFLAGS+= -DMACDIR='"${WORLDTMPDIR}${MACDIR}"' .include <bsd.prog.mk> Modified: projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/troff/nroff/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -33,18 +33,11 @@ LDADD= ${.OBJDIR}/../libhnj/libhnj.a CFLAGS+= -I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/nroff.d \ -I${DOCTOOLSDIR}/troff/ -DSHELL='"/bin/sh"' \ -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}"' -.endif + -DNROFF -DUSG -DEUC \ + -DMACDIR='"${WORLDTMPDIR}${MACDIR}"' \ + -DHYPDIR='"${WORLDTMPDIR}${HYPDIR}"' \ + -DFNTDIR='"${WORLDTMPDIR}${FNTDIR}"' \ + -DTABDIR='"${WORLDTMPDIR}${TABDIR}"' 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 Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/troff/troff/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -53,21 +53,12 @@ CFLAGS.dhtml+= -I${DOCTOOLSDIR}/troff/tr CFLAGS+= -I${DOCTOOLSDIR}/stuff/bst -I${DOCTOOLSDIR}/troff/troff.d \ -I${DOCTOOLSDIR}/troff/ -DSHELL='"/bin/sh"' \ - -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}"' -.endif + -DRELEASE='"${RELEASE}"' \ + -DMACDIR='"${WORLDTMPDIR}/${MACDIR}"' \ + -DHYPDIR='"${WORLDTMPDIR}/${HYPDIR}"' \ + -DFNTDIR='"${WORLDTMPDIR}/${FNTDIR}"' \ + -DTABDIR='"${WORLDTMPDIR}/${TABDIR}"' \ + -DPSTDIR='"${WORLDTMPDIR}/${PSTDIR}"' .include <bsd.progs.mk> Modified: projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile ============================================================================== --- projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile Mon Oct 10 20:24:32 2016 (r307004) +++ projects/doctools/cddl/usr.bin/doctools/troff/troff/tmac/Makefile Mon Oct 10 20:48:21 2016 (r307005) @@ -67,7 +67,7 @@ IMACS= an \ .SUFFIXES: .in .in: - sed 's:@MACDIR@:${MACDIR}:; s:@LIBDIR@:${LIBDIR}:' ${.IMPSRC} >${.TARGET} + sed 's:@MACDIR@:${WORLDTMPDIR}${MACDIR}:; s:@LIBDIR@:${WORLDTMPDIR}${LIBDIR}:' ${.IMPSRC} >${.TARGET} .include <bsd.prog.mk> .PATH: ${DOCTOOLSDIR}/troff/troff.d/tmac.d
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610102048.u9AKmLdv064160>