summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorriastradh <riastradh@pkgsrc.org>2020-03-30 16:51:53 +0000
committerriastradh <riastradh@pkgsrc.org>2020-03-30 16:51:53 +0000
commit776bb98b4b2f16b4d31496e3f93a14e4c8e767cc (patch)
tree323cd445ab6234dda1f3d82eb0045132c84a9ca9
parentdb3977f53c21d809de378b8f8a12b9a393ea8a57 (diff)
downloadpkgsrc-776bb98b4b2f16b4d31496e3f93a14e4c8e767cc.tar.gz
New package variable HASKELL_PKG_NAME.
Used to form _HASKELL_PKG_DESCR_DIR. Defaults to DISTNAME, but for some packages (hledger, incoming), the same DISTNAME is shared by multiple packages. So let the package define it explicitly if need be.
-rw-r--r--mk/haskell.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/haskell.mk b/mk/haskell.mk
index d59808778f5..84966ce3381 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.16 2020/03/24 20:43:17 joerg Exp $
+# $NetBSD: haskell.mk,v 1.17 2020/03/30 16:51:53 riastradh Exp $
#
# This Makefile fragment handles Haskell Cabal packages.
# See: http://www.haskell.org/cabal/
@@ -108,6 +108,7 @@ BUILD_DEFS+= HASKELL_ENABLE_HADDOCK_DOCUMENTATION
_VARGROUPS+= haskell
_DEF_VARS.haskell= \
HASKELL_OPTIMIZATION_LEVEL \
+ HASKELL_PKG_NAME \
_DISTBASE \
_DISTVERSION \
_GHC_BIN \
@@ -252,7 +253,8 @@ do-build:
# Define install target. We need installed-pkg-config to be installed
# for package registration (if any).
-_HASKELL_PKG_DESCR_DIR= ${PREFIX}/lib/${DISTNAME}/${_HASKELL_VERSION}
+HASKELL_PKG_NAME?= ${DISTNAME}
+_HASKELL_PKG_DESCR_DIR= ${PREFIX}/lib/${HASKELL_PKG_NAME}/${_HASKELL_VERSION}
_HASKELL_PKG_DESCR_FILE= ${_HASKELL_PKG_DESCR_DIR}/package-description
_HASKELL_PKG_ID_FILE= ${_HASKELL_PKG_DESCR_DIR}/package-id