diff options
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/settings/plugins/ifcfg-rh/meson.build | 3 | ||||
| -rwxr-xr-x | tools/meson-post-install.sh | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 73f161485c..a5dea295fa 100644 --- a/meson.build +++ b/meson.build @@ -895,6 +895,8 @@ meson.add_install_script( nm_pkgstatedir, enable_docs ? 'install_docs' : '', nm_mandir, + enable_ifcfg_rh ? 'create_network_scripts' : '', + nm_sysconfdir, ) output = '\nSystem paths:\n' diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build index f5cfff4c9d..9cda662a43 100644 --- a/src/settings/plugins/ifcfg-rh/meson.build +++ b/src/settings/plugins/ifcfg-rh/meson.build @@ -74,9 +74,6 @@ install_data( install_mode: 'rwxr-xr-x', ) -meson.add_install_script('sh', '-c', - 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_sysconfdir)) - if enable_tests subdir('tests') endif diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh index 76b44371b1..aaf3576da4 100755 --- a/tools/meson-post-install.sh +++ b/tools/meson-post-install.sh @@ -49,3 +49,7 @@ if [ "$6" = install_docs ]; then ln -f "${DESTDIR}${mandir}/man5/NetworkManager.conf.5" "${DESTDIR}${mandir}/man5/nm-system-settings.conf.5" fi +if [ "$8" = create_network_scripts ]; then + sysconfdir=$9 + mkdir -p "${DESTDIR}${sysconfdir}/sysconfig/network-scripts" +fi |