From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 4 Aug 2014 13:29:17 +0000 (+0100)
Subject: Makefile inclusion of Paths.mk should be conditional
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4549
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b15599e84f90232c80753fead201d50c89b5d159;p=xen.git

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 6bce206050..c1c83bc206 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 0aa1e6bdc6..5bac700ee7 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