[Xen-changelog] [xen master] Silently ignore rm and include errors during make distclean

[patchbot@xxxxxxx]

commit 38aabce5424710badc080decca23628442d80673
Author:     Daniel Kiper <daniel.kiper@xxxxxxxxxx>
AuthorDate: Tue May 7 13:51:46 2013 +0200
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed May 8 12:15:20 2013 +0100

    Silently ignore rm and include errors during make distclean
    
    Signed-off-by: Daniel Kiper <daniel.kiper@xxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Makefile                         |    2 +-
 buildconfigs/mk.linux-2.6-common |    2 +-
 stubdom/Makefile                 |    3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 32efb70..5a7107e 100644
--- a/Makefile
+++ b/Makefile
@@ -158,7 +158,7 @@ endif
 # clean, but blow away kernel build tree plus tarballs
 .PHONY: distclean
 distclean:
-       -rm config/Toplevel.mk
+       rm -f config/Toplevel.mk
        $(MAKE) -C xen distclean
        $(MAKE) -C tools distclean
        $(MAKE) -C stubdom distclean
diff --git a/buildconfigs/mk.linux-2.6-common b/buildconfigs/mk.linux-2.6-common
index f3680f0..e8e97fb 100644
--- a/buildconfigs/mk.linux-2.6-common
+++ b/buildconfigs/mk.linux-2.6-common
@@ -29,7 +29,7 @@ LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., 
,$(LINUX_VER)))
 .PHONY: _build
 _build: build
 
-include buildconfigs/src.$(XEN_LINUX_SOURCE)
+-include buildconfigs/src.$(XEN_LINUX_SOURCE)
 
 LINUX_ARCH = $$(sh buildconfigs/select-linux-arch $(LINUX_SRCDIR))
 IMAGE_PATH = $$(sh buildconfigs/select-linux-image $(LINUX_DIR) $(LINUX_ARCH) 
$(IMAGE_TARGET))
diff --git a/stubdom/Makefile b/stubdom/Makefile
index f316d4e..32f0daf 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -546,8 +546,7 @@ downloadclean: patchclean
 
 .PHONY: distclean
 distclean: downloadclean
-       -rm ../config/Stubdom.mk
-       rm -rf config.log config.status config.cache autom4te.cache
+       rm -rf config.log config.status config.cache autom4te.cache 
../config/Stubdom.mk
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Stubdom.mk:
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog