Merge commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07'

* commit '95e8ac60f8b7317ce23c648250fdc8fb68d65a07':
  build: normalize coverage.info

Conflicts:
	tests/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc tests/Makefile
index 60439c942041810fc94a4c7a1a1d9ae25a40054d,939490b3494e19bcd145e43b15fd4db0ba7eb14f..99be14fc7720adb4163c16883f20bd1ff8cfa435
--- 1/tests/Makefile
--- 2/tests/Makefile
+++ b/tests/Makefile
@@@ -166,8 -129,9 +166,9 @@@ fate-list
  
  coverage.info: TAG = LCOV
  coverage.info:
-       $(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | sed -e 's#/./#/#g' > $@
-       $(M)lcov --remove $@ "/usr*" -o $@
+       $(M)lcov -q -d $(CURDIR) -b $(SRC_PATH) --capture | \
+           sed "s,$(CURDIR)/\./,$(CURDIR)/," > $@
 -      $(M)lcov -q --remove $@ "/usr/include*" -o $@
++      $(M)lcov -q --remove $@ "/usr*" -o $@
  
  lcov:  TAG = GENHTML
  lcov: coverage.info