Makefile inclusion of Paths.mk should be conditional

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@citrix.com>
Cc: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in
index 6bce2060503970d573f16783e4f1b23938923cb6..c1c83bc2066240c07e1a626a52f2134fbf1dfe22 100644 (file)
--- 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 0aa1e6bdc66c79b44f232d9db1d56d076e42f2b3..5bac700ee70af47d4d6714cece2867fec8c69764 100644 (file)
--- 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