postgres.git / summary / log / commit / refs

commit    c3d9a66024a93e6d0380bdd1b18cb03a67216b72
Author:   Peter Eisentraut <peter_e@gmx.net>
Date:     Fri Aug 11 03:33:47 2017 +0000

    Support coverage on vpath builds
    
    A few paths needed to be tweaked so everything looks into the
    appropriate directories.
    
    Reviewed-by: Michael Paquier <michael.paquier@gmail.com>


 src/Makefile.global.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 9340d60de58..a4209df7c95 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -898,7 +898,7 @@ GENHTML_TITLE = PostgreSQL $(VERSION)
 
 coverage-html-stamp: lcov_base.info lcov_test.info
 	rm -rf coverage
-	$(GENHTML) $(GENHTML_FLAGS) -o coverage --title='$(GENHTML_TITLE)' --num-spaces=4 --prefix='$(abs_top_srcdir)' $^
+	$(GENHTML) $(GENHTML_FLAGS) -o coverage --title='$(GENHTML_TITLE)' --num-spaces=4 $^
 	touch $@
 
 LCOV += --gcov-tool $(GCOV)
@@ -907,12 +907,12 @@ LCOVFLAGS = -q --no-external
 all_gcno_files = $(shell find . -name '*.gcno' -print)
 
 lcov_base.info: $(all_gcno_files)
-	$(LCOV) $(LCOVFLAGS) -c -i -d . -o $@
+	$(LCOV) $(LCOVFLAGS) -c -i -d . -d $(srcdir) -o $@
 
 all_gcda_files = $(shell find . -name '*.gcda' -print)
 
 lcov_test.info: $(all_gcda_files)
-	$(LCOV) $(LCOVFLAGS) -c -d . -o $@
+	$(LCOV) $(LCOVFLAGS) -c -d . -d $(srcdir) -o $@
 
 
 # hook for clean-up


[parent: 52e1b1b04255]