[gnome-power-manager] trivial: Cleanup compiler defines

[Richard Hughes <rhughes src gnome org>]

commit 6a34351c634a407280be164546c9d08d4cab28d3
Author: Richard Hughes <richard hughsie com>
Date:   Tue Dec 6 16:54:34 2016 +0000

    trivial: Cleanup compiler defines

 src/Makefile.am      |    3 +--
 src/gpm-statistics.c |    6 ++++--
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 228c687..1a1862d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,13 +10,12 @@ AM_CPPFLAGS =                                               \
        $(UPOWER_CFLAGS)                                \
        -DBINDIR=\"$(bindir)\"                          \
        -DSBINDIR=\"$(sbindir)\"                        \
-       -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
+       -DLOCALEDIR=\""$(datadir)/locale"\"     \
        -DDATADIR=\"$(datadir)\"                        \
        -DPREFIX=\""$(prefix)"\"                        \
        -DSYSCONFDIR=\""$(sysconfdir)"\"                \
        -DLIBDIR=\""$(libdir)"\"                        \
        -DVERSION="\"$(VERSION)\""                      \
-       -DGPM_DATA=\"$(pkgdatadir)\"                    \
        -DGTKBUILDERDIR=\"$(pkgdatadir)\"               \
        -DUP_DISABLE_DEPRECATED                         \
        -DG_LOG_DOMAIN=\"PowerManager\"                 \
diff --git a/src/gpm-statistics.c b/src/gpm-statistics.c
index cf18d21..b10a900 100644
--- a/src/gpm-statistics.c
+++ b/src/gpm-statistics.c
@@ -1913,7 +1913,7 @@ main (int argc, char *argv[])
 
        setlocale (LC_ALL, "");
 
-       bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
+       bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
        bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
        textdomain (GETTEXT_PACKAGE);
 
@@ -1932,7 +1932,9 @@ main (int argc, char *argv[])
 
        /* add application specific icons to search path */
        gtk_icon_theme_append_search_path (gtk_icon_theme_get_default (),
-                                           GPM_DATA G_DIR_SEPARATOR_S "icons");
+                                           DATADIR G_DIR_SEPARATOR_S
+                                           "gnome-power-manager" G_DIR_SEPARATOR_S
+                                           "icons");
 
        /* run */
        status = g_application_run (G_APPLICATION (application), argc, argv);