[Xen-changelog] [xen master] Makefile inclusion of Paths.mk should be conditional

[patchbot@xxxxxxx]

commit b15599e84f90232c80753fead201d50c89b5d159
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Mon Aug 4 14:29:17 2014 +0100
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Mon Aug 4 17:00:10 2014 +0100

    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@xxxxxxxxxx>
    Cc: Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

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