diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am
index b42e7f9ebc..843c06d354 100644
--- a/legacy/evas/Makefile.am
+++ b/legacy/evas/Makefile.am
@@ -161,23 +161,22 @@ endif
 
 if EFL_ENABLE_COVERAGE
 lcov-reset:
-	@rm -rf coverage
-	@find . -name "*.gcda" -exec rm {} \;
-	@lcov --directory . --zerocounters
+	@rm -rf $(top_builddir)/coverage
+	@find $(top_builddir) -name "*.gcda" -delete
+	@lcov --zerocounters --directory $(top_builddir)
 
 lcov-report:
-	@mkdir coverage
-	@lcov --compat-libtool --directory $(top_srcdir)/src --capture --output-file coverage/coverage.info
-	@lcov -l coverage/coverage.info |grep "\\.h"  |cut -d " " -f 2 > coverage/remove
-	@lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info
-	@rm coverage/remove
-	@mv coverage/coverage.cleaned.info coverage/coverage.info
-	@genhtml -t "$(PACKAGE_STRING)" -o coverage coverage/coverage.info
+	@mkdir $(top_builddir)/coverage
+	lcov --capture --compat-libtool --output-file $(top_builddir)/coverage/coverage.info --directory $(top_builddir)
+	lcov --remove $(top_builddir)/coverage/coverage.info '*.h' --output-file $(top_builddir)/coverage/coverage.cleaned.info
+	genhtml -t "$(PACKAGE_STRING)" -o $(top_builddir)/coverage/html $(top_builddir)/coverage/coverage.cleaned.info
+	@echo "Coverage Report at $(top_builddir)/coverage/html"
+
 
 coverage:
-	@make lcov-reset
-	@make check
-	@make lcov-report
+	@$(MAKE) lcov-reset
+	@$(MAKE) check
+	@$(MAKE) lcov-report
 else
 lcov-reset:
 	@echo "reconfigure with --enable-coverage"
diff --git a/legacy/evas/doc/Makefile.am b/legacy/evas/doc/Makefile.am
index e06ec9d31f..900c3d90c6 100644
--- a/legacy/evas/doc/Makefile.am
+++ b/legacy/evas/doc/Makefile.am
@@ -20,6 +20,8 @@ doc: all doc-clean
 	bzip2 -9 $(PACKAGE_DOCNAME).tar
 	rm -rf $(PACKAGE_DOCNAME)/
 	mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
+	@echo "Documentation Package: doc/$(PACKAGE_DOCNAME).tar.bz2"
+	@echo "Documentation HTML: doc/html"
 
 clean-local: doc-clean