Skip to content

meson: Use configure_file() with install argument instead of install_data() #2961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 7, 2025
+10 −18
Merged

meson: Use configure_file() with install argument instead of install_data() #2961

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,8 @@ disc = configure_file(
input: 'etc/discovery.conf.in',
output: 'discovery.conf',
configuration: substs,
install: true,
install_dir: join_paths(sysconfdir, 'nvme'),
)

dracut_files = [
Expand All @@ -243,6 +245,8 @@ foreach file : dracut_files
input: 'nvmf-autoconnect/dracut-conf/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: dracutrulesdir,
)
endforeach

Expand All @@ -259,6 +263,8 @@ foreach file : systemd_files
input: 'nvmf-autoconnect/systemd/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: systemddir,
)
endforeach

Expand All @@ -276,6 +282,8 @@ foreach file : udev_files
input: 'nvmf-autoconnect/udev-rules/' + file + '.in',
output: file,
configuration: substs,
install: true,
install_dir: udevrulesdir
)
endforeach

Expand Down Expand Up @@ -323,31 +331,15 @@ executable(
install_dir: sbindir
)

libnvme_subproject = subproject('libnvme')

################################################################################
install_data('completions/bash-nvme-completion.sh',
rename: 'nvme',
install_dir: datadir + '/bash-completion/completions')
install_data('completions/_nvme',
install_dir: datadir + '/zsh/site-functions')

foreach file : dracut_files
install_data(meson.current_build_dir() + '/' + file,
install_dir: dracutrulesdir)
endforeach

foreach file : systemd_files
install_data(meson.current_build_dir() + '/' + file,
install_dir: systemddir)
endforeach

foreach file : udev_files
install_data(meson.current_build_dir() + '/' + file,
install_dir: udevrulesdir)
endforeach

install_data(disc,
install_dir: join_paths(sysconfdir, 'nvme'))

################################################################################
if meson.version().version_compare('>=0.53.0')
path_dict = {
Expand Down