From 8a5f25e8351dd793a615ecec95f4c0b894d32956 Mon Sep 17 00:00:00 2001 From: Geoffroy Van Cutsem Date: Tue, 15 Feb 2022 11:29:50 +0100 Subject: [PATCH] Makefile: put 'serial.conf' in final location The 'serial.conf' file need to be put in /etc/, but it is currently being installed in $(libdir)/acrn/. We therefore ask the user to manually copy that file over to the /etc/ folder. This patch fixes that by installing 'serial.conf' directly there. Tracked-On: #7107 Signed-off-by: Geoffroy Van Cutsem --- hypervisor/Makefile | 2 +- paths.make | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index 63cf4c27f..81f38266e 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -406,7 +406,7 @@ install: $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin install -D $(HV_OBJDIR)/acpi/*.bin -t $(DESTDIR)$(libdir)/acrn/acpi/; \ fi @if [ -e "$(HV_OBJDIR)/serial.conf" ];then \ - install -D $(HV_OBJDIR)/serial.conf -t $(DESTDIR)$(libdir)/acrn/; \ + install -D -b $(HV_OBJDIR)/serial.conf -t $(DESTDIR)$(sysconfdir)/; \ fi install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out diff --git a/paths.make b/paths.make index 65a235822..430fecc3a 100644 --- a/paths.make +++ b/paths.make @@ -6,3 +6,4 @@ nonarchlibdir ?= $(prefix)/lib datadir ?= $(prefix)/share includedir ?= $(prefix)/include systemd_unitdir ?= $(prefix)/lib/systemd +sysconfdir ?= /etc