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.

4 files changed, 27 insertions, 32 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)
 
diff --git a/configure.ac b/configure.ac
index 5609f28121..7ac11e1127 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,9 +183,10 @@ dnl
 AC_ARG_WITH(dist-version,
             AS_HELP_STRING([--with-dist-version=<NM-distribution-version>],
                            [Define the NM''s distribution version string]),
-            ac_distver=$withval, ac_distver=$NM_VERSION)
-AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string])
-AC_SUBST(NM_DIST_VERSION, "$ac_distver")
+            ac_distver=$withval, ac_distver="")
+if ! test x"$ac_distver" = x""; then
+	AC_DEFINE_UNQUOTED(NM_DIST_VERSION, "$ac_distver", [Define the distribution version string])
+fi
 
 AC_ARG_ENABLE(wifi, AS_HELP_STRING([--enable-wifi], [enable Wi-Fi support]))
 if test "${enable_wifi}" != "no"; then
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index e1bdc45235..04f78a205c 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -26,7 +26,6 @@
 
 %global systemd_dir %{_prefix}/lib/systemd/system
 %global nmlibdir %{_prefix}/lib/%{name}
-%global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
 
 %global _hardened_build 1
 
@@ -529,7 +528,7 @@ ln -s ../10-ifcfg-rh-routes.sh %{buildroot}%{_sysconfdir}/%{name}/dispatcher.d/n
 
 rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la
-rm -f %{buildroot}%{nmplugindir}/*.la
+rm -f %{buildroot}%{_libdir}/NetworkManager/*.la
 
 # Ensure the documentation timestamps are constant to avoid multilib conflicts
 find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+
@@ -605,9 +604,8 @@ fi
 %{_libexecdir}/nm-dhcp-helper
 %{_libexecdir}/nm-dispatcher
 %{_libexecdir}/nm-iface-helper
-%dir %{_libdir}/%{name}
-%dir %{nmplugindir}
-%{nmplugindir}/libnm-settings-plugin*.so
+%dir %{_libdir}/NetworkManager
+%{_libdir}/NetworkManager/libnm-settings-plugin*.so
 %if %{with nmtui}
 %exclude %{_mandir}/man1/nmtui*
 %endif
@@ -637,35 +635,35 @@ fi
 
 %if %{with adsl}
 %files adsl
-%{nmplugindir}/libnm-device-plugin-adsl.so
+%{_libdir}/%{name}/libnm-device-plugin-adsl.so
 %else
-%exclude %{nmplugindir}/libnm-device-plugin-adsl.so
+%exclude %{_libdir}/%{name}/libnm-device-plugin-adsl.so
 %endif
 
 %if %{with bluetooth}
 %files bluetooth
-%{nmplugindir}/libnm-device-plugin-bluetooth.so
+%{_libdir}/%{name}/libnm-device-plugin-bluetooth.so
 %endif
 
 %if %{with team}
 %files team
-%{nmplugindir}/libnm-device-plugin-team.so
+%{_libdir}/%{name}/libnm-device-plugin-team.so
 %endif
 
 %if %{with wifi}
 %files wifi
-%{nmplugindir}/libnm-device-plugin-wifi.so
+%{_libdir}/%{name}/libnm-device-plugin-wifi.so
 %endif
 
 %if %{with wwan}
 %files wwan
-%{nmplugindir}/libnm-device-plugin-wwan.so
-%{nmplugindir}/libnm-wwan.so
+%{_libdir}/%{name}/libnm-device-plugin-wwan.so
+%{_libdir}/%{name}/libnm-wwan.so
 %endif
 
 %if %{with ovs}
 %files ovs
-%{nmplugindir}/libnm-device-plugin-ovs.so
+%{_libdir}/%{name}/libnm-device-plugin-ovs.so
 %{systemd_dir}/NetworkManager.service.d/NetworkManager-ovs.conf
 %{_mandir}/man7/nm-openvswitch.7*
 %endif
@@ -673,7 +671,7 @@ fi
 %if %{with ppp}
 %files ppp
 %{_libdir}/pppd/%{ppp_version}/nm-pppd-plugin.so
-%{nmplugindir}/libnm-ppp-plugin.so
+%{_libdir}/%{name}/libnm-ppp-plugin.so
 %endif
 
 %if %{with libnm_glib}
diff --git a/meson.build b/meson.build
index 480c56ff88..dc1524aa0d 100644
--- a/meson.build
+++ b/meson.build
@@ -25,12 +25,6 @@ nm_id_prefix = 'NM'
 
 nm_gir_version = '1.0'
 
-# Distribution version string
-dist_version = get_option('dist_version')
-if dist_version == ''
-  dist_version = nm_version
-endif
-
 nm_prefix = get_option('prefix')
 nm_bindir = join_paths(nm_prefix, get_option('bindir'))
 nm_datadir = join_paths(nm_prefix, get_option('datadir'))
@@ -51,7 +45,7 @@ nm_pkgincludedir = join_paths(nm_includedir, nm_name)
 nm_pkglibdir = join_paths(nm_prefix, 'lib', nm_name)
 nm_pkgrundir = join_paths(nm_runstatedir, nm_name)
 nm_pkgstatedir = join_paths(nm_localstatedir, nm_name)
-nm_plugindir = join_paths(nm_libdir, nm_name, dist_version)
+nm_plugindir = join_paths(nm_libdir, nm_name)
 
 libnm_name = 'libnm'
 
@@ -265,7 +259,11 @@ if config_plugins_default == ''
 endif
 config_h.set_quoted('NM_CONFIG_DEFAULT_MAIN_PLUGINS', config_plugins_default)
 
-config_h.set_quoted('NM_DIST_VERSION', dist_version)
+# Distribution version string
+dist_version = get_option('dist_version')
+if dist_version != ''
+  config_h.set_quoted('NM_DIST_VERSION', dist_version)
+endif
 
 enable_wifi = get_option('wifi')
 config_h.set10('WITH_WIFI', enable_wifi)