diff options
| -rw-r--r-- | regress/usr.bin/mandoc/db/dbm_dump/Makefile | 10 | ||||
| -rw-r--r-- | regress/usr.bin/mandoc/db/run/Makefile | 13 |
2 files changed, 8 insertions, 15 deletions
diff --git a/regress/usr.bin/mandoc/db/dbm_dump/Makefile b/regress/usr.bin/mandoc/db/dbm_dump/Makefile index 3cfce5dffd3..5b126758496 100644 --- a/regress/usr.bin/mandoc/db/dbm_dump/Makefile +++ b/regress/usr.bin/mandoc/db/dbm_dump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/09/04 11:51:38 bluhm Exp $ +# $OpenBSD: Makefile,v 1.4 2016/09/23 15:08:10 bluhm Exp $ PROG = dbm_dump CPPFLAGS += -I${BSDSRCDIR}/usr.bin/mandoc @@ -6,14 +6,10 @@ MOBJS = dbm.o dbm_map.o LDADD += ${MOBJS} CLEANFILES = ${MOBJS} -regress: dbm_dump - dbm_dump: ${MOBJS} ${MOBJS}: - @cd ${BSDSRCDIR}/usr.bin/mandoc && make depend - @cd ${BSDSRCDIR}/usr.bin/mandoc && make ${MOBJS} - @cp ${BSDOBJDIR}/usr.bin/mandoc/$@ . || \ - cp ${BSDSRCDIR}/usr.bin/mandoc/$@ . + cd ${BSDSRCDIR}/usr.bin/mandoc && make $@ + ln -sf ${.OBJDIR}/../../../../../usr.bin/mandoc/$@ . .include <bsd.prog.mk> diff --git a/regress/usr.bin/mandoc/db/run/Makefile b/regress/usr.bin/mandoc/db/run/Makefile index fac8fd3c6f9..39e8bdce53c 100644 --- a/regress/usr.bin/mandoc/db/run/Makefile +++ b/regress/usr.bin/mandoc/db/run/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/08/30 22:20:03 schwarze Exp $ +# $OpenBSD: Makefile,v 1.4 2016/09/23 15:08:10 bluhm Exp $ # # Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org> # @@ -41,6 +41,7 @@ CLEANFILES = ${ALL_TESTS:C/$/.db/} CLEANFILES += ${ALL_TESTS:C/$/.dout/} ${ALL_TESTS:C/$/.derr/} all.derr CLEANFILES += ${MOB_TESTS:C/$/.mout/} all.mout CLEANFILES += ${MEB_TESTS:C/$/.merr/} all.merr +CLEANFILES += binedit dbm_dump makeinodes # === MAIN REGRESSION TARGETS ========================================== @@ -76,7 +77,7 @@ diff.merr: all.merr cleandir: cleandir_local cleandir_local: - rm -rf man binedit dbm_dump makeinodes + rm -rf man # === RUNNING DBM_DUMP ================================================= @@ -490,11 +491,7 @@ badfmagic.db: binedit empty.db # === GETTING ACCESS TO THE UTILITIES ================================== binedit dbm_dump makeinodes: - @if [ -x ${.CURDIR}/../$@/obj/$@ ]; \ - then ln -s ${.CURDIR}/../$@/obj/$@; \ - elif [ -x ${.CURDIR}/../$@/$@ ]; \ - then ln -s ${.CURDIR}/../$@/$@; \ - else echo "Cannot find $@ binary; run 'make' in .." 1>&2; \ - exit 1; fi + cd ${.CURDIR}/../$@ && make all + ln -sf ${.OBJDIR}/../$@/$@ . .include <bsd.regress.mk> |