summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--utils/hpc/ghc.mk6
-rw-r--r--utils/hpc/hpc-bin.cabal9
2 files changed, 11 insertions, 4 deletions
diff --git a/utils/hpc/ghc.mk b/utils/hpc/ghc.mk
index 2485e1639d..917e099ef8 100644
--- a/utils/hpc/ghc.mk
+++ b/utils/hpc/ghc.mk
@@ -10,10 +10,8 @@
#
# -----------------------------------------------------------------------------
-utils/hpc_dist-install_MODULES = Main HpcCombine HpcDraft HpcFlags HpcLexer \
- HpcMarkup HpcOverlay HpcParser HpcReport \
- HpcShowTix HpcUtils
-utils/hpc_dist-install_HC_OPTS = -cpp -package hpc
+utils/hpc_USES_CABAL = YES
+utils/hpc_PACKAGE = hpc-bin
utils/hpc_dist-install_INSTALL = YES
utils/hpc_dist-install_INSTALL_INPLACE = YES
utils/hpc_dist-install_PROG = hpc$(exeext)
diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
index 133ea5fb35..bce8ea501b 100644
--- a/utils/hpc/hpc-bin.cabal
+++ b/utils/hpc/hpc-bin.cabal
@@ -22,6 +22,15 @@ Flag base3
Executable hpc
Main-Is: Hpc.hs
Other-Modules: HpcParser
+ HpcCombine
+ HpcDraft
+ HpcFlags
+ HpcLexer
+ HpcMarkup
+ HpcOverlay
+ HpcReport
+ HpcShowTix
+ HpcUtils
if flag(base4)
Build-Depends: base >= 4 && < 5