Date: Mon, 10 Oct 2016 06:58:33 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r306940 - in projects/doctools/cddl/usr.bin/doctools: grap ptx refer Message-ID: <201610100658.u9A6wXKm038364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610100658.u9A6wXKm038364>