[metacity] i18n: use localedir

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

commit 409faaaa95c10b9cec6f9e9fb7c515faefa1582e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Sep 27 17:26:34 2015 +0300

    i18n: use localedir

 src/Makefile.am       |   16 +++++++++++++++-
 src/tools/Makefile.am |    2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 73804d2..711a21e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,8 +1,22 @@
+NULL =
+
 lib_LTLIBRARIES = libmetacity-private.la
 
 SUBDIRS = tools themes
 
-AM_CPPFLAGS=-I$(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS \" 
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" 
-DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 @METACITY_CFLAGS@ 
$(WARN_CFLAGS) $(AM_CFLAGS)
+AM_CPPFLAGS = \
+       -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" \
+       -DHOST_ALIAS=\"@HOST_ALIAS \" \
+       -DMETACITY_LOCALEDIR=\""$(localedir)"\" \
+       -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" \
+       -DMETACITY_DATADIR=\"$(datadir)\" \
+       -DG_LOG_DOMAIN=\"metacity\" \
+       -DSN_API_NOT_YET_FROZEN=1 \
+       -I$(srcdir)/include \
+       @METACITY_CFLAGS@ \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
 
 metacity_SOURCES=                              \
        core/main.c                             \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 86e320a..3ac594f 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -5,7 +5,7 @@ icon_DATA=metacity-window-demo.png
 
 AM_CPPFLAGS= METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
        -DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
-       -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
+       -DMETACITY_LOCALEDIR=\""$(localedir)"\"
 
 metacity_message_SOURCES=                              \
        metacity-message.c