CVS commit: pkgsrc/mk

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 28 19:11:43 UTC 2024

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk: Additional fix for bulk build


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 pkgsrc/mk/haskell.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.64 pkgsrc/mk/haskell.mk:1.65
--- pkgsrc/mk/haskell.mk:1.64   Sun Apr 28 19:08:37 2024
+++ pkgsrc/mk/haskell.mk        Sun Apr 28 19:11:43 2024
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.64 2024/04/28 19:08:37 pho Exp $
+# $NetBSD: haskell.mk,v 1.65 2024/04/28 19:11:43 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -182,10 +182,8 @@ _HASKELL_VERSION=  ghc-${_HASKELL_VERSION
 
 # Determine the path to the global Haskell package database. We need this
 # in our INSTALL and DEINSTALL hooks.
-.if !defined(_HASKELL_GLOBAL_PKG_DB)
-_HASKELL_GLOBAL_PKG_DB!=       ${_HASKELL_BIN:Q} --print-global-package-db
-.endif
-MAKEVARS+=                     _HASKELL_GLOBAL_PKG_DB
+_HASKELL_GLOBAL_PKG_DB_CMD=    ${_HASKELL_BIN:Q} --print-global-package-db
+_HASKELL_GLOBAL_PKG_DB=                ${_HASKELL_GLOBAL_PKG_DB_CMD:sh}
 
 # By default GHC uses a per-user default environment file if one is
 # available. Cabal has to be visible in order to compile Setup.?hs,