build: meson: fix install script

Fix directory paths and modes.

Fixes: 98b4a19a53
This commit is contained in:
Beniamino Galvani
2018-09-23 16:57:14 +02:00
parent dcfddeef7a
commit 24fc3c54a3
2 changed files with 8 additions and 5 deletions

View File

@@ -928,7 +928,7 @@ meson.add_install_script(
nm_bindir, nm_bindir,
nm_pkgconfdir, nm_pkgconfdir,
nm_pkglibdir, nm_pkglibdir,
nm_localstatedir, nm_pkgstatedir,
enable_docs ? 'install_docs' : '', enable_docs ? 'install_docs' : '',
nm_mandir nm_mandir
) )

View File

@@ -4,7 +4,7 @@ datadir=$1
bindir=$2 bindir=$2
pkgconfdir=$3 pkgconfdir=$3
pkglibdir=$4 pkglibdir=$4
localstatedir=$5 pkgstatedir=$5
[ -n "$DESTDIR" ] && DESTDIR=${DESTDIR%%/}/ [ -n "$DESTDIR" ] && DESTDIR=${DESTDIR%%/}/
@@ -26,12 +26,15 @@ for dir in "${pkgconfdir}/conf.d" \
"${pkgconfdir}/dispatcher.d/pre-up.d" \ "${pkgconfdir}/dispatcher.d/pre-up.d" \
"${pkgconfdir}/dnsmasq.d" \ "${pkgconfdir}/dnsmasq.d" \
"${pkgconfdir}/dnsmasq-shared.d" \ "${pkgconfdir}/dnsmasq-shared.d" \
"${pkgconfdir}/conf.d" \ "${pkglibdir}/conf.d" \
"${pkgconfdir}/VPN" \ "${pkglibdir}/VPN"; do
"${localstatedir}/lib/NetworkManager"; do
mkdir -p "${DESTDIR}${dir}" mkdir -p "${DESTDIR}${dir}"
chmod 0755 "${DESTDIR}${dir}"
done done
mkdir -p "${DESTDIR}${pkgstatedir}"
chmod 0700 "${DESTDIR}${pkgstatedir}"
if [ "$6" = install_docs ]; then if [ "$6" = install_docs ]; then
mandir=$7 mandir=$7