meson: Move network-config directory creation to main install file

The `ifcfg-rh` meson build file installs a new post install script
to create the `network-config` directory.

This has been moved to the main post install file so it's easier to
find because all post install steps are together and it avoids and
extra post install script execution.
This commit is contained in:
Iñigo Martínez
2019-09-11 08:59:12 +02:00
committed by Thomas Haller
parent f5f9c071ba
commit a010fcb5f7
3 changed files with 6 additions and 3 deletions

View File

@@ -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'

View File

@@ -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

View File

@@ -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