[Xen-devel] [PATCH] Makefile inclusion of Paths.mk should be conditional

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

Since it may not exist when doing e.g. "make clean". There is
existing logic in the makefiles which will raise an error if an
actual build target is invoked without having run configure.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxx>
---
Luis, any reason why config/Stubdom.mk.in in one case and
tools/Rules.mk in the other?
---
 config/Stubdom.mk.in |    2 +-
 tools/Rules.mk       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
index 6bce206..c1c83bc 100644
--- a/config/Stubdom.mk.in
+++ b/config/Stubdom.mk.in
@@ -1,5 +1,5 @@
 # Prefix and install folder
-include $(XEN_ROOT)/config/Paths.mk
+-include $(XEN_ROOT)/config/Paths.mk
 prefix              := @prefix@
 PREFIX              := $(prefix)
 exec_prefix         := @exec_prefix@
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 0aa1e6b..5bac700 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -5,7 +5,7 @@ all:
 
 -include $(XEN_ROOT)/config/Tools.mk
 include $(XEN_ROOT)/Config.mk
-include $(XEN_ROOT)/config/Paths.mk
+-include $(XEN_ROOT)/config/Paths.mk
 
 export _INSTALL := $(INSTALL)
 INSTALL = $(XEN_ROOT)/tools/cross-install
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel