Index: projects/doctools/cddl/usr.bin/doctools/grap/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/grap/Makefile	(revision 306939)
+++ projects/doctools/cddl/usr.bin/doctools/grap/Makefile	(revision 306940)
@@ -1,27 +1,35 @@
 PROG=	grap
 SRCS=	coord.c \
 	for.c \
 	frame.c \
 	grap.y \
 	grapl.c \
 	input.c \
 	label.c \
 	main.c \
 	misc.c \
 	plot.c \
 	print.c \
 	ticks.c \
 	version.c \
 	y.tab.h
 
 FILES=	grap.defines
 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
Index: projects/doctools/cddl/usr.bin/doctools/ptx/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/ptx/Makefile	(revision 306939)
+++ projects/doctools/cddl/usr.bin/doctools/ptx/Makefile	(revision 306940)
@@ -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
Index: projects/doctools/cddl/usr.bin/doctools/refer/Makefile
===================================================================
--- projects/doctools/cddl/usr.bin/doctools/refer/Makefile	(revision 306939)
+++ projects/doctools/cddl/usr.bin/doctools/refer/Makefile	(revision 306940)
@@ -1,74 +1,78 @@
 SUBDIR=	papers
 PROGS=	refer addbib lookbib sortbib mkey inv hunt
 SRCS.refer= glue1.c \
 	refer1.c \
 	refer2.c \
 	refer4.c \
 	refer5.c \
 	refer6.c \
 	mkey3.c \
 	refer7.c \
 	refer8.c \
 	hunt2.c \
 	hunt3.c \
 	deliv2.c \
 	hunt5.c \
 	hunt6.c \
 	hunt8.c \
 	glue3.c \
 	hunt7.c \
 	hunt9.c \
 	glue2.c \
 	glue4.c \
 	glue5.c \
 	refer0.c \
 	shell.c
 
 SRCS.mkey=	mkey1.c \
 		mkey2.c \
 		mkey3.c \
 		deliv2.c
 
 SRCS.inv=	inv1.c \
 		inv2.c \
 		inv3.c \
 		inv5.c \
 		inv6.c \
 		deliv2.c
 
 SRCS.hunt=	hunt1.c \
 		hunt2.c \
 		hunt3.c \
 		hunt5.c \
 		hunt6.c \
 		hunt7.c \
 		glue5.c \
 		refer3.c \
 		hunt9.c \
 		shell.c \
 		deliv2.c \
 		hunt8.c \
 		glue4.c \
 		tick.c
 
 MAN.mkey=
 MAN.inv=
 MAN.hunt=
 
 SCRIPTS=	roffbib indxbib
 CLEANFILES=	roffbib indxbib
 
 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:
 	echo "#!/bin/sh" > ${.TARGET}
 	sed 's:@BINDIR@:$(BINDIR):g; s:@REFDIR@:${REFDIR}:g' ${.IMPSRC} >> ${.TARGET}
 
 .include <bsd.progs.mk>
 
 .PATH: ${DOCTOOLSDIR}/refer