diff options
| author | Gabor Pali <pgj@FreeBSD.org> | 2013-02-02 13:29:08 +0000 |
|---|---|---|
| committer | Gabor Pali <pgj@FreeBSD.org> | 2013-02-02 13:29:08 +0000 |
| commit | 2fa807b19246c6359c63244104d2fd2abce0286a (patch) | |
| tree | f74dbf852347112c9bade95df0249d31dffdb5c4 /lang/ghc | |
| parent | - Update to 1.4.30 (diff) | |
- PKGNAMEPREFIX must appear earlier for bsd.cabal.mk consumers otherwise
their options are mishandled
Reported by: sperber
Obtained from: FreeBSD Haskell
Notes
Notes:
svn path=/head/; revision=311427
Diffstat (limited to 'lang/ghc')
| -rw-r--r-- | lang/ghc/bsd.cabal.mk | 3 | ||||
| -rw-r--r-- | lang/ghc/bsd.cabal.options.mk | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lang/ghc/bsd.cabal.mk b/lang/ghc/bsd.cabal.mk index 40f7b7f7c50d..55efc4943188 100644 --- a/lang/ghc/bsd.cabal.mk +++ b/lang/ghc/bsd.cabal.mk @@ -9,9 +9,6 @@ # Maintained by: haskell@FreeBSD.org # -HSPREFIX= hs- -PKGNAMEPREFIX?= ${HSPREFIX} - .if !defined(METAPORT) MASTER_SITES?= http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/ .else diff --git a/lang/ghc/bsd.cabal.options.mk b/lang/ghc/bsd.cabal.options.mk index 28d4a490c636..1310cff6636e 100644 --- a/lang/ghc/bsd.cabal.options.mk +++ b/lang/ghc/bsd.cabal.options.mk @@ -10,6 +10,9 @@ CABALOPTIONSMKINCLUDED= yes +HSPREFIX= hs- +PKGNAMEPREFIX?= ${HSPREFIX} + LOCALBASE?= /usr/local GHC_CMD?= ${LOCALBASE}/bin/ghc HADDOCK_CMD?= ${LOCALBASE}/bin/haddock |