tools: config-create: Do not enter infinite over disabled PCI devices

[jailhouse.git] / Makefile

diff --git a/Makefile b/Makefile
index 05b8265cd8c332d767566180e2e4c12efe8459f5..6d597af281d4a74c91e59cb38aa9ebe63464f382 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,12 @@
 # the COPYING file in the top-level directory.
 #
 
+# Check make version
+need := 3.82
+ifneq ($(need),$(firstword $(sort $(MAKE_VERSION) $(need))))
+$(error Too old make version $(MAKE_VERSION), at least $(need) required)
+endif
+
 # no recipes above this one (also no includes)
 all: modules tools
 
@@ -52,7 +58,13 @@ modules_install: modules
 firmware_install: $(DESTDIR)$(firmwaredir) modules
        $(INSTALL_DATA) hypervisor/jailhouse*.bin $<
 
-install: modules_install firmware_install
+ifeq ($(ARCH),x86)
+TOOL_INMATES_INSTALL := tool_inmates_install
+tool_inmates_install: $(DESTDIR)$(libexecdir)/jailhouse
+       $(INSTALL_DATA) inmates/tools/$(ARCH)/*.bin $<
+endif
+
+install: modules_install firmware_install $(TOOL_INMATES_INSTALL)
        $(Q)$(MAKE) -C tools $@
 
 .PHONY: modules_install install clean firmware_install modules tools docs \