pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk New package variable HASKELL_PKG_NAME.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/974b454fe938
branches:  trunk
changeset: 414620:974b454fe938
user:      riastradh <riastradh%pkgsrc.org@localhost>
date:      Mon Mar 30 16:51:53 2020 +0000

description:
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.

diffstat:

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

diffs (27 lines):

diff -r ce6ae6ddd371 -r 974b454fe938 mk/haskell.mk
--- a/mk/haskell.mk     Mon Mar 30 16:51:43 2020 +0000
+++ b/mk/haskell.mk     Mon Mar 30 16:51:53 2020 +0000
@@ -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 @@
 _VARGROUPS+=           haskell
 _DEF_VARS.haskell= \
        HASKELL_OPTIMIZATION_LEVEL \
+       HASKELL_PKG_NAME \
        _DISTBASE \
        _DISTVERSION \
        _GHC_BIN \
@@ -252,7 +253,8 @@
 
 # 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
 



Home | Main Index | Thread Index | Old Index