diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-11-15 19:18:46 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-26 22:07:30 +0200 |
| commit | a95b674c396650dea1d9311de357d172aa65f44f (patch) | |
| tree | 4894dd3c20a9c2337824d2e78dd1c3e501b4bcd9 | |
| parent | 5aff6fc83b65b400b010163563bc4765def298b1 (diff) | |
| download | NetworkManager-a95b674c396650dea1d9311de357d172aa65f44f.tar.gz | |
build: install dispatcher dirs in /usr
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.
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rwxr-xr-x | tools/meson-post-install.sh | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 1bba093e25..e86dbcd702 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3891,14 +3891,15 @@ dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freed dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service - -dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d - install-data-hook-dispatcher: - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir) - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d - $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-down.d + $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmconfdir)/dispatcher.d/pre-up.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 diff --git a/tools/meson-post-install.sh b/tools/meson-post-install.sh index 2037c0ceb4..d2474f475d 100755 --- a/tools/meson-post-install.sh +++ b/tools/meson-post-install.sh @@ -27,6 +27,9 @@ for dir in "${pkgconfdir}/conf.d" \ "${pkgconfdir}/dnsmasq.d" \ "${pkgconfdir}/dnsmasq-shared.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 mkdir -p "${DESTDIR}${dir}" chmod 0755 "${DESTDIR}${dir}" |