Files
kata-containers/snap/1162-runtime.patch
2019-01-28 09:19:24 -06:00

28 lines
1.0 KiB
Diff

diff --git a/Makefile b/Makefile
index 1c11f74..9c4709b 100644
--- a/Makefile
+++ b/Makefile
@@ -248,11 +248,11 @@ ifeq (,$(findstring $(DEFAULT_HYPERVISOR),$(KNOWN_HYPERVISORS)))
endif
ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_QEMU))
- DEFAULT_HYPERVISOR_CONFIG_PATH = $(CONFIG_PATH_QEMU)
+ DEFAULT_HYPERVISOR_CONFIG_FILE = $(CONFIG_FILE_QEMU)
endif
ifeq ($(DEFAULT_HYPERVISOR),$(HYPERVISOR_FC))
- DEFAULT_HYPERVISOR_CONFIG_PATH = $(CONFIG_PATH_FC)
+ DEFAULT_HYPERVISOR_CONFIG_FILE = $(CONFIG_FILE_FC)
endif
CONFDIR := $(DEFAULTSDIR)/$(PROJECT_DIR)
@@ -546,7 +546,7 @@ install-bin-libexec: $(BINLIBEXECLIST)
install-configs: $(CONFIGS)
$(QUIET_INST)$(foreach f,$(CONFIGS),$(call INSTALL_CONFIG,$f,$(dir $(CONFIG_PATH))))
- $(QUIET_INST)ln -sf $(DEFAULT_HYPERVISOR_CONFIG_PATH) $(CONFIG_PATH)
+ $(QUIET_INST)(cd $(dir $(DESTDIR)/$(CONFIG_PATH)) && ln -sf $(DEFAULT_HYPERVISOR_CONFIG_FILE) $(CONFIG_FILE))
install-scripts: $(SCRIPTS)
$(QUIET_INST)$(foreach f,$(SCRIPTS),$(call INSTALL_EXEC,$f,$(SCRIPTS_DIR)))