[folks] tools: use the right locale directory



commit cc0f932aa3ee373b604741b7b7fc23db1280f7c6
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Mar 19 16:53:36 2013 +0000

    tools: use the right locale directory
    
    I happened to notice that they're misusing $(pkgdatadir) - $(pkgdatadir)
    is $(datadir)/$(PACKAGE), i.e. typically /usr/share/folks, but
    localization is installed to $(localedir), typically /usr/share/locale.
    
    This resulted in the tools looking in /opt/gnome-3.8/share/folks/locale
    in my installation, instead of the correct /opt/gnome-3.8/share/locale.

 tools/Makefile.am         |    2 +-
 tools/inspect/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 9ecbaaa..86a2562 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -25,7 +25,7 @@ folks_import_SOURCES = \
 folks_import_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -include $(CONFIG_HEADER) \
-       -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \
+       -DLOCALE_DIR=\"$(localedir)\" \
        -I$(top_srcdir) \
        -I$(top_srcdir)/folks \
        $(NULL)
diff --git a/tools/inspect/Makefile.am b/tools/inspect/Makefile.am
index 3681fa9..03b0b38 100644
--- a/tools/inspect/Makefile.am
+++ b/tools/inspect/Makefile.am
@@ -38,7 +38,7 @@ folks_inspect_LDADD = \
 folks_inspect_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -include $(CONFIG_HEADER) \
-       -DLOCALE_DIR=\"$(pkgdatadir)/locale\" \
+       -DLOCALE_DIR=\"$(localedir)\" \
        -I$(top_srcdir) \
        -I$(top_srcdir)/folks \
        $(NULL)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]