summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meson.build1
-rw-r--r--rules.d/90-vconsole.rules.in (renamed from src/vconsole/90-vconsole.rules.in)0
-rw-r--r--rules.d/meson.build2
-rw-r--r--src/vconsole/meson.build9
4 files changed, 2 insertions, 10 deletions
diff --git a/meson.build b/meson.build
index 582e33c9a7..69d2f97693 100644
--- a/meson.build
+++ b/meson.build
@@ -2069,7 +2069,6 @@ subdir('src/timedate')
subdir('src/timesync')
subdir('src/tmpfiles')
subdir('src/userdb')
-subdir('src/vconsole')
subdir('src/xdg-autostart-generator')
subdir('src/systemd')
diff --git a/src/vconsole/90-vconsole.rules.in b/rules.d/90-vconsole.rules.in
index 845785492b..845785492b 100644
--- a/src/vconsole/90-vconsole.rules.in
+++ b/rules.d/90-vconsole.rules.in
diff --git a/rules.d/meson.build b/rules.d/meson.build
index a391390292..a582e4e922 100644
--- a/rules.d/meson.build
+++ b/rules.d/meson.build
@@ -55,6 +55,8 @@ rules_in = [
['70-uaccess.rules', enable_logind and conf.get('HAVE_ACL') == 1],
['71-seat.rules', enable_logind],
['73-seat-late.rules', enable_logind],
+
+ ['90-vconsole.rules', conf.get('ENABLE_VCONSOLE') == 1],
]
foreach tuple : rules_in
diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build
deleted file mode 100644
index bb3c3c5a03..0000000000
--- a/src/vconsole/meson.build
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-custom_target(
- '90-vconsole.rules',
- input : '90-vconsole.rules.in',
- output : '90-vconsole.rules',
- command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'],
- install : conf.get('ENABLE_VCONSOLE') == 1,
- install_dir : udevrulesdir)