[gimp/gimp-2-10] Undo some (unnecessary) changes.

[Jehan <jehanp src gnome org>]

commit aaf581669598b0173a90d514b73186cf725b5cd2
Author: Salamandar <felix piedallu me>
Date:   Fri Jan 25 00:05:09 2019 +0000

    Undo some (unnecessary) changes.
    
    (cherry picked from commit fc657184a09eb52c0851c99092112170007871b3)

 app/config/Makefile.am    | 2 +-
 plug-ins/help/Makefile.am | 2 +-
 tools/Makefile.am         | 2 +-
 tools/gimptool.c          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/app/config/Makefile.am b/app/config/Makefile.am
index 3f7f395011..c3df49f3bc 100644
--- a/app/config/Makefile.am
+++ b/app/config/Makefile.am
@@ -15,7 +15,7 @@ endif
 AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"Gimp-Config\"                          \
        -DGIMP_APP_VERSION_STRING=\"$(GIMP_APP_VERSION)\"       \
-       -DGIMPDATADIR=\""$(datadir)"\"                          \
+       -DDATADIR=\""$(datadir)"\"                              \
        -I$(top_builddir)                                       \
        -I$(top_srcdir)                                         \
        -I$(top_builddir)/app                                   \
diff --git a/plug-ins/help/Makefile.am b/plug-ins/help/Makefile.am
index a8823716b6..dbc36108e6 100644
--- a/plug-ins/help/Makefile.am
+++ b/plug-ins/help/Makefile.am
@@ -17,7 +17,7 @@ help_RC = help.rc.o
 endif
 
 AM_CPPFLAGS = \
-       -DGIMPDATADIR=\""$(gimpdatadir)"\"      \
+       -DDATADIR=\""$(gimpdatadir)"\"  \
        -I$(top_srcdir)                 \
        $(CAIRO_CFLAGS)                 \
        $(GIO_CFLAGS)                   \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 3d86a22176..574d072499 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -73,7 +73,7 @@ AM_CPPFLAGS = \
        -DBINDIR=\""$(bindir)"\"                                \
        -DSBINDIR=\""$(sbindir)"\"                              \
        -DLIBEXECDIR=\""$(libexecdir)"\"                        \
-       -DSYSDATADIR=\""$(datadir)"\"                           \
+       -DDATADIR=\""$(datadir)"\"                              \
        -DDATAROOTDIR=\""$(datarootdir)"\"                      \
        -DSYSCONFDIR=\""$(sysconfdir)"\"                        \
        -DSHAREDSTATEDIR=\""$(sharedstatedir)"\"                \
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 24a40d8bd7..5705cabf35 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -75,7 +75,7 @@ static struct {
   { "bindir",         BINDIR         },
   { "sbindir",        SBINDIR        },
   { "libexecdir",     LIBEXECDIR     },
-  { "datadir",        SYSDATADIR     },
+  { "datadir",        DATADIR        },
   { "datarootdir",    DATAROOTDIR    },
   { "sysconfdir",     SYSCONFDIR     },
   { "sharedstatedir", SHAREDSTATEDIR },