[frogr/meson: 2/16] Use PACKAGE_NAME, PACKAGE_VERSION and DATADIR definitions

[Mario Sanchez Prada <msanchez src gnome org>]

commit c2f7290ccdda559578083ac7479ab98fb7772bc6
Author: Mario Sanchez Prada <msanchez gnome org>
Date:   Tue May 23 12:59:48 2017 +0100

    Use PACKAGE_NAME, PACKAGE_VERSION and DATADIR definitions
    
    We will be using this definitions when migrating to meson,
    instead of the old PACKAGE, VERSION and DATA_DIR.

 src/frogr-about-dialog.c |    4 ++--
 src/frogr-global-defs.h  |    4 ++--
 src/frogr-util.c         |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/frogr-about-dialog.c b/src/frogr-about-dialog.c
index 6981d3b..08ceb3e 100644
--- a/src/frogr-about-dialog.c
+++ b/src/frogr-about-dialog.c
@@ -56,11 +56,11 @@ frogr_about_dialog_show (GtkWindow *parent)
   logo = gdk_pixbuf_new_from_file (icon_full_path, NULL);
   g_free (icon_full_path);
 
-  version = g_strdup_printf ("%s~unreleased", VERSION);
+  version = g_strdup_printf ("%s~unreleased", PACKAGE_VERSION);
 
   /* Show about dialog */
   gtk_show_about_dialog (GTK_WINDOW (parent),
-                         "name", PACKAGE,
+                         "name", PACKAGE_NAME,
                          "authors", authors,
                          "artists", artists,
                          "comments", _(appdescr),
diff --git a/src/frogr-global-defs.h b/src/frogr-global-defs.h
index 7d5bd13..afc2bee 100644
--- a/src/frogr-global-defs.h
+++ b/src/frogr-global-defs.h
@@ -24,8 +24,8 @@
 #include <config.h>
 
 #define APP_NAME N_("Flickr Remote Organizer")
-#define APP_SHORTNAME PACKAGE
-#define APP_VERSION VERSION
+#define APP_SHORTNAME PACKAGE_NAME
+#define APP_VERSION PACKAGE_VERSION
 #define APP_ID "org.gnome.frogr"
 
 /* Max width and heigth for pictures in the icon view.
diff --git a/src/frogr-util.c b/src/frogr-util.c
index 6a3dabc..87ff79b 100644
--- a/src/frogr-util.c
+++ b/src/frogr-util.c
@@ -72,7 +72,7 @@ frogr_util_get_app_data_dir (void)
 {
   static gchar *app_data_dir = NULL;
   if (!app_data_dir)
-    app_data_dir = g_strdup_printf ("%s/frogr", DATA_DIR);
+    app_data_dir = g_strdup_printf ("%s/frogr", DATADIR);
 
   return (const gchar *) app_data_dir;
 }
@@ -82,7 +82,7 @@ frogr_util_get_icons_dir (void)
 {
   static gchar *icons_dir = NULL;
   if (!icons_dir)
-    icons_dir = g_strdup_printf ("%s/icons", DATA_DIR);
+    icons_dir = g_strdup_printf ("%s/icons", DATADIR);
 
   return (const gchar *) icons_dir;
 }