colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: install dispatcher dirs in /usr

Browse Source 
The dispatcher looks there for scripts now. This actually doesn't break
the RPM build, since it doesn't mind extra empty directories in
buildroot. Good.
This commit is contained in:
Lubomir Rintel
2018-11-15 19:18:46 +01:00
parent 5aff6fc83b
commit a95b674c39
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile.am
View File

@@ -3891,14 +3891,15 @@ dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freed
dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service
CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service
dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
install-data-hook-dispatcher: install-data-hook-dispatcher:
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-down.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-up.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/no-wait.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-down.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/pre-up.d
$(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/dispatcher.d/no-wait.d
install_data_hook += install-data-hook-dispatcher install_data_hook += install-data-hook-dispatcher

3
tools/meson-post-install.sh
View File

@@ -27,6 +27,9 @@ for dir in "${pkgconfdir}/conf.d" \
"${pkgconfdir}/dnsmasq.d" \ "${pkgconfdir}/dnsmasq.d" \
"${pkgconfdir}/dnsmasq-shared.d" \ "${pkgconfdir}/dnsmasq-shared.d" \
"${pkglibdir}/conf.d" \ "${pkglibdir}/conf.d" \
"${pkglibdir}/dispatcher.d/no-wait.d" \
"${pkglibdir}/dispatcher.d/pre-down.d" \
"${pkglibdir}/dispatcher.d/pre-up.d" \
"${pkglibdir}/VPN"; do "${pkglibdir}/VPN"; do
mkdir -p "${DESTDIR}${dir}" mkdir -p "${DESTDIR}${dir}"
chmod 0755 "${DESTDIR}${dir}" chmod 0755 "${DESTDIR}${dir}"