[pkgsrc/trunk]: pkgsrc/mk Build ${WRKSRC}/Setup in the do-configure phase

[pho <pho%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/361030c017dd
branches:  trunk
changeset: 422084:361030c017dd
user:      pho <pho%pkgsrc.org@localhost>
date:      Mon Jan 20 14:14:33 2020 +0000

description:
Build ${WRKSRC}/Setup in the do-configure phase

Doing it in pre-configure makes it unable to do SUBST in that phase.

diffstat:

 mk/haskell.mk |  16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diffs (33 lines):

diff -r 39fdd1e54a1b -r 361030c017dd mk/haskell.mk
--- a/mk/haskell.mk     Mon Jan 20 13:40:48 2020 +0000
+++ b/mk/haskell.mk     Mon Jan 20 14:14:33 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.14 2020/01/19 23:45:06 pho Exp $
+# $NetBSD: haskell.mk,v 1.15 2020/01/20 14:14:33 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages.
 # See: http://www.haskell.org/cabal/
@@ -226,18 +226,14 @@
        fi
 .endif
 
-# We might not have any working Haskell interpreter so compile
-# Setup.?hs to a binary. Since dynamic linkage is much faster, we try
-# it and then fall back to static linkage if that didn't work.
-pre-configure: ${WRKSRC}/Setup
-
-${WRKSRC}/Setup:
+# Define configure target. We might not have any working Haskell
+# interpreter so compile Setup.?hs to a binary. Since dynamic linkage
+# is much faster, we try it and then fall back to static linkage if
+# that didn't work.
+do-configure:
        ${RUN}cd ${WRKSRC} && \
                ( ${_HASKELL_BIN:Q} --make Setup -dynamic || \
                        ${_HASKELL_BIN:Q} --make Setup -static )
-
-# Define configure target.
-do-configure:
        ${RUN}cd ${WRKSRC:Q} && \
                ${SETENV} ${CONFIGURE_ENV} \
                        ./Setup configure ${PKG_VERBOSE:D-v} ${CONFIGURE_ARGS}