From: Daniel Kiper <daniel.kiper@oracle.com>
Date: Tue, 7 May 2013 11:51:46 +0000 (+0200)
Subject: Silently ignore rm and include errors during make distclean
X-Git-Tag: 4.3.0-rc2~75
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=38aabce5424710badc080decca23628442d80673;p=people%2Fiwj%2Fxen.git

Silently ignore rm and include errors during make distclean

Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/Makefile b/Makefile
index 32efb709a6..5a7107eb21 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 f3680f0982..e8e97fbcaf 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 f316d4e985..32f0daf63d 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: