[folks] Simplify how we get PACKAGE_DATADIR

[Simon McVittie <smcv src gnome org>]

commit 1f74d5db4b62ebf5b9c53d4ba84ab632cde35a39
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue Mar 19 16:55:44 2013 +0000

    Simplify how we get PACKAGE_DATADIR
    
    DATA_DIR and PACKAGE_DATADIR appear to have been intended to both be
    ${prefix}/share/folks, but due to a typo (sharedir vs. shareddir)
    DATA_DIR was actually defined to an empty string. Neither is actually
    used anywhere at the moment.
    
    Bug https://bugzilla.gnome.org/show_bug.cgi?id=690830
    Signed-off-by: Simon McVittie <simon mcvittie collabora co uk>
    Reviewed-by: Philip Withnall <philip tecnocode co uk>

 folks/Makefile.am     |    3 ---
 folks/build-conf.vapi |    6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/folks/Makefile.am b/folks/Makefile.am
index b255e39..c4746b9 100644
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -1,9 +1,6 @@
-sharedir = $(datadir)/folks
-
 AM_CPPFLAGS = \
        -include $(CONFIG_HEADER) \
        -DPACKAGE_DATADIR=\"$(pkgdatadir)\" \
-       -DDATA_DIR=\"$(shareddir)\" \
        -DBACKEND_DIR=\"$(BACKEND_DIR)\" \
        -DG_LOG_DOMAIN=\"folks\" \
        $(NULL)
diff --git a/folks/build-conf.vapi b/folks/build-conf.vapi
index 36d2095..0a0046e 100644
--- a/folks/build-conf.vapi
+++ b/folks/build-conf.vapi
@@ -24,9 +24,6 @@
 [CCode (cheader_filename = "config.h")]
 public class Folks.BuildConf
 {
-  [CCode (cname = "DATA_DIR")]
-  public static const string DATA_DIR;
-
   [CCode (cname = "BACKEND_DIR")]
   public static const string BACKEND_DIR;
 
@@ -39,6 +36,9 @@ public class Folks.BuildConf
   [CCode (cname = "PACKAGE_STRING")]
   public static const string PACKAGE_STRING;
 
+  [CCode (cname = "PACKAGE_DATADIR")]
+  public static const string PACKAGE_DATADIR;
+
   [CCode (cname = "GETTEXT_PACKAGE")]
   public static const string GETTEXT_PACKAGE;