[gnome-panel] install modules in */gnome-panel/modules

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 65426d2bc10fb75fb8046cb2f2a515b1684b587d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Dec 2 14:57:32 2016 +0200

    install modules in */gnome-panel/modules

 data/pkgconfig/libgnome-panel.pc.in                |    2 +-
 gnome-panel/libpanel-applet-private/Makefile.am    |    2 +-
 .../libpanel-applet-private/gp-applet-manager.c    |    4 ++--
 modules/external/clock/Makefile.am                 |    2 +-
 modules/external/fish/Makefile.am                  |    2 +-
 modules/external/notification-area/Makefile.am     |    2 +-
 modules/external/status-notifier/Makefile.am       |    2 +-
 modules/external/wncklet/Makefile.am               |    2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/data/pkgconfig/libgnome-panel.pc.in b/data/pkgconfig/libgnome-panel.pc.in
index 815863c..812542b 100644
--- a/data/pkgconfig/libgnome-panel.pc.in
+++ b/data/pkgconfig/libgnome-panel.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
-appletsdir=@libdir@/gnome-panel/applets
+modulesdir=@libdir@/gnome-panel/modules
 
 Name: libgnome-panel
 Description: libgnome-panel
diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am
index 438ef39..af39f36 100644
--- a/gnome-panel/libpanel-applet-private/Makefile.am
+++ b/gnome-panel/libpanel-applet-private/Makefile.am
@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = \
        $(NULL)
 
 libpanel_applet_private_la_CFLAGS = \
-       -DAPPLETSDIR=\""$(libdir)/gnome-panel/applets"\" \
+       -DMODULESDIR=\""$(libdir)/gnome-panel/modules"\" \
        -DDATADIR=\""$(datadir)"\" \
        -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \
        -I$(srcdir) \
diff --git a/gnome-panel/libpanel-applet-private/gp-applet-manager.c 
b/gnome-panel/libpanel-applet-private/gp-applet-manager.c
index 52e4bdf..d992e18 100644
--- a/gnome-panel/libpanel-applet-private/gp-applet-manager.c
+++ b/gnome-panel/libpanel-applet-private/gp-applet-manager.c
@@ -78,7 +78,7 @@ load_modules (GpAppletManager *manager)
   GDir *dir;
   const gchar *name;
 
-  dir = g_dir_open (APPLETSDIR, 0, NULL);
+  dir = g_dir_open (MODULESDIR, 0, NULL);
   if (!dir)
     return;
 
@@ -88,7 +88,7 @@ load_modules (GpAppletManager *manager)
       GpModule *module;
       const gchar *id;
 
-      path = g_build_filename (APPLETSDIR, name, NULL);
+      path = g_build_filename (MODULESDIR, name, NULL);
       module = gp_module_new_from_path (path);
       g_free (path);
 
diff --git a/modules/external/clock/Makefile.am b/modules/external/clock/Makefile.am
index 18edae8..97b3c30 100644
--- a/modules/external/clock/Makefile.am
+++ b/modules/external/clock/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = pixmaps
 
-clock_libdir = $(libdir)/gnome-panel/applets
+clock_libdir = $(libdir)/gnome-panel/modules
 clock_lib_LTLIBRARIES = clock.la
 
 if ENABLE_EDS
diff --git a/modules/external/fish/Makefile.am b/modules/external/fish/Makefile.am
index c22d0d1..82d04b4 100644
--- a/modules/external/fish/Makefile.am
+++ b/modules/external/fish/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-fish_libdir = $(libdir)/gnome-panel/applets
+fish_libdir = $(libdir)/gnome-panel/modules
 fish_lib_LTLIBRARIES = fish.la
 
 fish_la_SOURCES = \
diff --git a/modules/external/notification-area/Makefile.am b/modules/external/notification-area/Makefile.am
index 78bdc95..a9d64d4 100644
--- a/modules/external/notification-area/Makefile.am
+++ b/modules/external/notification-area/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-notification_area_libdir = $(libdir)/gnome-panel/applets
+notification_area_libdir = $(libdir)/gnome-panel/modules
 notification_area_lib_LTLIBRARIES = notification-area.la
 
 notification_area_la_CPPFLAGS = \
diff --git a/modules/external/status-notifier/Makefile.am b/modules/external/status-notifier/Makefile.am
index f9b3dd4..2fa9ee2 100644
--- a/modules/external/status-notifier/Makefile.am
+++ b/modules/external/status-notifier/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-status_notifier_libdir = $(libdir)/gnome-panel/applets
+status_notifier_libdir = $(libdir)/gnome-panel/modules
 status_notifier_lib_LTLIBRARIES = status-notifier.la
 
 status_notifier_la_CPPFLAGS = \
diff --git a/modules/external/wncklet/Makefile.am b/modules/external/wncklet/Makefile.am
index 558447d..1ab6d05 100644
--- a/modules/external/wncklet/Makefile.am
+++ b/modules/external/wncklet/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-wncklet_libdir = $(libdir)/gnome-panel/applets
+wncklet_libdir = $(libdir)/gnome-panel/modules
 wncklet_lib_LTLIBRARIES = wncklet.la
 
 wncklet_la_CPPFLAGS = \