diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2018-05-11 10:41:50 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2018-05-11 10:41:50 +0200 |
| commit | 62363ebc8fbe1caf537932a27a723772d2eb725b (patch) | |
| tree | 535327c19ab3e5764415d684913c07bd5ff4e7b7 /Makefile.am | |
| parent | 60b6cbff404ea720d913e5e04386fd41a45af7a9 (diff) | |
| download | NetworkManager-62363ebc8fbe1caf537932a27a723772d2eb725b.tar.gz | |
Revert "build: qualify plugin dir name with a version string"
This is broken -- looks for VPN plugins in a version-qualified path,
which is wrong and break installed VPN plugins.
This reverts commit 6384ad4ee16f31dd103f790bd193c4049d89a6fc.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 808ed91160..638055c91d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,7 +20,7 @@ sbin_PROGRAMS = bin_PROGRAMS = libexec_PROGRAMS = lib_LTLIBRARIES = -plugin_LTLIBRARIES = +pkglib_LTLIBRARIES = core_plugins = service_DATA = man_MANS = @@ -73,8 +73,6 @@ examplesdir = $(docdir)/examples rundir=$(runstatedir)/NetworkManager statedir=$(localstatedir)/lib/NetworkManager -plugindir=$(pkglibdir)/$(NM_DIST_VERSION) - dbusactivationdir = $(datadir)/dbus-1/system-services servicedir = $(datadir)/dbus-1/system-services @@ -580,7 +578,7 @@ libnm_core_libnm_core_la_CPPFLAGS = \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ - -DNMPLUGINDIR=\"$(plugindir)\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ $(NULL) @@ -1175,7 +1173,7 @@ src_cppflags = \ \ -DNMCONFDIR=\"$(nmconfdir)\" \ -DNMLOCALEDIR=\"$(datadir)/locale\" \ - -DNMPLUGINDIR=\"$(plugindir)\" \ + -DNMPLUGINDIR=\"$(pkglibdir)\" \ -DNMRUNDIR=\"$(nmrundir)\" \ -DNMSTATEDIR=\"$(nmstatedir)\" \ -DNMLIBDIR=\"$(nmlibdir)\" \ @@ -4659,7 +4657,7 @@ check_PROGRAMS += $(check_programs) $(check_programs_norun) check_LTLIBRARIES += $(check_ltlibraries) endif -plugin_LTLIBRARIES += $(core_plugins) +pkglib_LTLIBRARIES += $(core_plugins) TESTS += $(check_programs) @@ -4759,7 +4757,7 @@ install-data-hook: $(install_data_hook) $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/conf.d $(mkinstalldirs) -m 0755 $(DESTDIR)$(nmlibdir)/VPN $(mkinstalldirs) -m 0700 $(DESTDIR)$(nmstatedir) - $(mkinstalldirs) -m 0755 $(DESTDIR)$(plugindir) + $(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir) uninstall-hook: $(uninstall_hook) |