[gnome-software: 5/7] build: Move plugins to a subdirectory of the private libdir

[Philip Withnall <pwithnall src gnome org>]

commit f637338a5b892ff4be225edac2495e2ec7056af2
Author: Philip Withnall <pwithnall endlessos org>
Date:   Thu Mar 11 13:33:40 2021 +0000

    build: Move plugins to a subdirectory of the private libdir
    
    Now they’re installed in
    `$(prefix)/lib/gnome-software/plugins-$(api_version)` rather than
    `$(prefix)/lib/gs-plugins-$(api_version)`, which makes things a bit
    neater.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 contrib/gnome-software.spec.in | 2 +-
 lib/gs-plugin-loader.c         | 4 ++--
 lib/meson.build                | 5 ++++-
 plugins/meson.build            | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 57fd80308..184c37475 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -71,7 +71,7 @@ Obsoletes: gnome-software-editor < 3.35.1
 
 # this is not a library version
 %define gs_plugin_version               15
-%define gs_plugin_dir %{_libdir}/gs-plugins-%{gs_plugin_version}
+%define gs_plugin_dir %{_libdir}/gnome-software/plugins-%{gs_plugin_version}
 
 %description
 gnome-software is an application that makes it easy to add, remove
diff --git a/lib/gs-plugin-loader.c b/lib/gs-plugin-loader.c
index 2cc0fc4d4..3355d7a3c 100644
--- a/lib/gs-plugin-loader.c
+++ b/lib/gs-plugin-loader.c
@@ -2374,8 +2374,8 @@ gs_plugin_loader_setup (GsPluginLoader *plugin_loader,
        /* use the default, but this requires a 'make install' */
        if (plugin_loader->locations->len == 0) {
                g_autofree gchar *filename = NULL;
-               filename = g_strdup_printf ("gs-plugins-%s", GS_PLUGIN_API_VERSION);
-               g_ptr_array_add (plugin_loader->locations, g_build_filename (LIBDIR, filename, NULL));
+               filename = g_strdup_printf ("plugins-%s", GS_PLUGIN_API_VERSION);
+               g_ptr_array_add (plugin_loader->locations, g_build_filename (LIBDIR, "gnome-software", 
filename, NULL));
        }
 
        for (i = 0; i < plugin_loader->locations->len; i++) {
diff --git a/lib/meson.build b/lib/meson.build
index ba305e773..ab0912915 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -112,7 +112,10 @@ pkg.generate(
     filebase : 'gnome-software',
     name : 'gnome-software',
     subdirs : 'gnome-software',
-    variables : 'plugindir=${libdir}/gs-plugins-' + gs_plugin_api_version,
+    variables : [
+      'gs_private_libdir=${libdir}/gnome-software',
+      'plugindir=${gs_private_libdir}/plugins-' + gs_plugin_api_version,
+    ],
     install_dir : join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig'),  # or it defaults to 
gs_private_libdir, which is wrong
 )
 
diff --git a/plugins/meson.build b/plugins/meson.build
index 6e70d09d8..7245ef51a 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -1,4 +1,4 @@
-plugin_dir = join_paths(get_option('libdir'), 'gs-plugins-' + gs_plugin_api_version)
+plugin_dir = join_paths(gs_private_libdir, 'plugins-' + gs_plugin_api_version)
 plugin_libs = [
   appstream,
   gio_unix,