From 5f2cdb2add0efcdb12c6ba6cbefeccb550b0eb2a Mon Sep 17 00:00:00 2001
From: Michele Tartara <mtartara@google.com>
Date: Wed, 12 Dec 2012 14:46:27 +0100
Subject: [PATCH] Fix a bug in the hs-coverage rule of Makefile.am

The coverage information for mon-collector was not merged correctly.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 95e298d4a..c7865e633 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1738,7 +1738,7 @@ hs-coverage: $(haskell_tests) htest/hpc-htools htest/hpc-mon-collector
 	rm -f *.tix
 	$(MAKE) $(AM_MAKEFLAGS) hs-check
 	@mkdir_p@ $(COVERAGE_HS_DIR)
-	hpc combine --union $(HPCEXCL) \
+	hpc sum --union $(HPCEXCL) \
 	  test.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
 	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
 	hpc report coverage-htools.tix
-- 
GitLab