summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-01-10 17:11:36 +0000
committerjlam <jlam@pkgsrc.org>2005-01-10 17:11:36 +0000
commit7d392b5a0357b8476e4ad1b5ff02564c1b39adae (patch)
tree68038c88d381bb64a6d8eaf7410775d82351c301 /regress
parentf2762f9d6a676c157fdc24f9017461aef62240ba (diff)
downloadpkgsrc-7d392b5a0357b8476e4ad1b5ff02564c1b39adae.tar.gz
Update to work with current bsd.wrapper.mk.
Diffstat (limited to 'regress')
-rw-r--r--regress/buildlink-transform/Makefile18
1 files changed, 5 insertions, 13 deletions
diff --git a/regress/buildlink-transform/Makefile b/regress/buildlink-transform/Makefile
index eb46f964e25..7ec834c1a83 100644
--- a/regress/buildlink-transform/Makefile
+++ b/regress/buildlink-transform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/09/25 22:05:46 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/01/10 17:11:36 jlam Exp $
#
# Run many buildlink transform tests in a single regression test to avoid
# having to keep creating the wrapper scripts over and over again.
@@ -40,23 +40,15 @@ REGRESS_ENV+= WRAPPER_DEBUG=yes
# arguments.
#
REGRESS= ${ECHO}
-.if defined(PHASES_AFTER_WRAPPER)
-_WRAPPEES+= REGRESS
+WRAPPEES+= REGRESS
_WRAP_ALIASES.REGRESS= regress
-WRAPPER_PHASE= wrapper
-.else
-_BLNK_WRAPPEES+= REGRESS
-_ALIASES.REGRESS= regress
-WRAPPER_PHASE= buildlink
-WRAPPER_BINDIR= ${BUILDLINK_DIR}/bin
-.endif
-post-${WRAPPER_PHASE}:
- @${RM} ${WRAPPER_BINDIR}/${REGRESS}
+post-wrapper:
+ @${RM} -f ${WRAPPER_BINDIR}/${REGRESS}
.PHONY: regress do-regress
-regress: ${WRAPPER_PHASE} do-regress
+regress: wrapper do-regress
FAILED_TESTS= ${WRKDIR}/failed
PASSED_TESTS= ${WRKDIR}/passed