Distcleanup config files only in toplevel directory.

Do not execute 'rm -r' with empty $(DISTCLEAN_DIRS).
lvm-version.h is already cleaned with subtarget distcleaning.
Always distcleanup lcov_reports*.

diff --git a/Makefile.in b/Makefile.in
index f8688313d5f25d694ffa2ecd9011cc3570814ba3..e0158cb9e2a9341dc3372fc7a333ec34a2a18560 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,8 +37,9 @@ ifeq ($(MAKECMDGOALS),distclean)
   SUBDIRS = doc include man scripts \
     lib tools daemons libdm \
     udev po liblvm test/api test
-  DISTCLEAN_DIRS += lcov_reports*
 endif
+DISTCLEAN_DIRS += lcov_reports*
+DISTCLEAN_TARGETS += config.cache config.log config.status make.tmpl
 
 include make.tmpl
 

diff --git a/make.tmpl.in b/make.tmpl.in
index 8b93bb1370634bb1481495ffeb0ce587fd120d4b..b42358a518487442a443f0497b652c0833db2bbf 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -306,11 +306,8 @@ clean: $(SUBDIRS.clean)
        $(SOURCES2:%.c=%.o) $(SOURCES2:%.c=%.d) $(SOURCES2:%.c=%.gcno) $(SOURCES2:%.c=%.gcda)
 
 distclean: clean $(SUBDIRS.distclean)
-       $(RM) -r $(DISTCLEAN_DIRS)
-       $(RM) $(DISTCLEAN_TARGETS)  \
-             config.cache config.log config.status \
-             Makefile make.tmpl core \
-             lvm-version.h
+       test -z "$(DISTCLEAN_DIRS)" || $(RM) -r $(DISTCLEAN_DIRS)
+       $(RM) $(DISTCLEAN_TARGETS) Makefile core
 
 .export.sym: .exported_symbols
        set -e; (echo "Base {"; echo "  global:"; \