49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
|
From 4dadabe36fb3277996870869c62d5cffab72f781 Mon Sep 17 00:00:00 2001
|
||
|
|
From: vegbir <yangjiaqi16@huawei.com>
|
||
|
|
Date: Mon, 17 Jul 2023 08:36:34 +0000
|
||
|
|
Subject: [PATCH 16/16] adapt meson build & install
|
||
|
|
|
||
|
|
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
|
||
|
|
---
|
||
|
|
Makefile | 2 +-
|
||
|
|
config/init/meson.build | 3 ++-
|
||
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 38fbe04..891d7ad 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -6,7 +6,7 @@ all: meson
|
||
|
|
|
||
|
|
.PHONY: meson
|
||
|
|
meson:
|
||
|
|
- [ -d build ] || meson setup build/
|
||
|
|
+ [ -d build ] || meson setup build/ --prefix=/usr
|
||
|
|
|
||
|
|
.PHONY: dist
|
||
|
|
dist: meson
|
||
|
|
diff --git a/config/init/meson.build b/config/init/meson.build
|
||
|
|
index 8445955..c781b59 100644
|
||
|
|
--- a/config/init/meson.build
|
||
|
|
+++ b/config/init/meson.build
|
||
|
|
@@ -2,7 +2,7 @@
|
||
|
|
|
||
|
|
if 'systemd' in init_script
|
||
|
|
systemd = dependency('systemd')
|
||
|
|
- systemd_system_unit_dir = get_option('prefix') + systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
||
|
|
+ systemd_system_unit_dir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
|
||
|
|
systemd_service = custom_target(
|
||
|
|
'lxcfs.service',
|
||
|
|
input: 'systemd/lxcfs.service.in',
|
||
|
|
@@ -14,6 +14,7 @@ if 'systemd' in init_script
|
||
|
|
'@OUTPUT@',
|
||
|
|
],
|
||
|
|
install: true,
|
||
|
|
+ install_mode: 'rw-r--r--',
|
||
|
|
install_dir: systemd_system_unit_dir)
|
||
|
|
endif
|
||
|
|
|
||
|
|
--
|
||
|
|
2.41.0
|
||
|
|
|