| Message ID | 5ddf6d99ba377d87f8c6750fac0037d06415801f.1407158957.git.ian.campbell@citrix.com |
|---|---|
| State | Accepted |
| Commit | b15599e84f90232c80753fead201d50c89b5d159 |
| Headers | show |
Ian Campbell writes ("[PATCH] 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.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
On Mon, 2014-08-04 at 16:56 +0100, Ian Jackson wrote: > Ian Campbell writes ("[PATCH] 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. > > Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Thanks, applied.
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
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> --- 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(-)