From 3c1b4c9346933326198ce69a97b5d088dcb81ca8 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sun, 19 Jan 2020 16:22:11 +0100
Subject: gettext: Fix locale dir

This allows to load the translations.
---
 baobab/src/Makefile.am                  |  2 +-
 configure.ac                            |  5 -----
 gsearchtool/src/Makefile.am             |  2 +-
 logview/src/Makefile.am                 | 10 +++++-----
 mate-dictionary/libgdict/Makefile.am    |  2 +-
 mate-dictionary/src/Makefile.am         |  2 +-
 mate-disk-image-mounter/src/Makefile.am | 10 +++++-----
 mate-screenshot/src/Makefile.am         |  8 ++++----
 8 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index 5b6f1987..8af4b1d3 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\""$(libdir)"\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DBAOBAB_PIX_DIR=\""$(datadir)/mate-disk-usage-analyzer/pixmaps/"\" \
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DMATELOCALEDIR=\""$(datadir)/locale"\" \
 	$(NULL)
 
 bin_PROGRAMS = mate-disk-usage-analyzer
diff --git a/configure.ac b/configure.ac
index 48dd878b..475d6b49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -332,11 +332,6 @@ AC_SUBST(GETTEXT_PACKAGE)
 
 GLIB_GSETTINGS
 
-# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
-# this is the directory where the *.{mo,gmo} files are installed
-mateutilslocaledir='${prefix}/${DATADIRNAME}/locale'
-AC_SUBST(mateutilslocaledir)
-
 dnl gtk-doc stuff
 GTK_DOC_CHECK([1.10])
 
diff --git a/gsearchtool/src/Makefile.am b/gsearchtool/src/Makefile.am
index 7091e0f1..14582a23 100644
--- a/gsearchtool/src/Makefile.am
+++ b/gsearchtool/src/Makefile.am
@@ -3,7 +3,7 @@ NULL =
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/gsearchtool/libeggsmclient \
 	-I$(top_srcdir)/gsearchtool/libmateui-deprecated \
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DMATELOCALEDIR=\""$(datadir)/locale"\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
 	-DDATADIR=\""$(datadir)"\" \
 	-DGREP_COMMAND=\""$(GREP_COMMAND)"\"
diff --git a/logview/src/Makefile.am b/logview/src/Makefile.am
index a0268760..1fbff996 100644
--- a/logview/src/Makefile.am
+++ b/logview/src/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = tests
 
-AM_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\"mate-system-log\"			\
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
-	-DDATADIR=\""$(datadir)"\"				\
-	-DLOGVIEWINSTALLPREFIX=\""$(prefix)/\""			\
+AM_CPPFLAGS =						\
+	-DG_LOG_DOMAIN=\"mate-system-log\"		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"		\
+	-DDATADIR=\""$(datadir)"\"			\
+	-DLOGVIEWINSTALLPREFIX=\""$(prefix)/\""		\
 	$(NULL)
 
 bin_PROGRAMS = mate-system-log
diff --git a/mate-dictionary/libgdict/Makefile.am b/mate-dictionary/libgdict/Makefile.am
index 202c1808..4882749c 100644
--- a/mate-dictionary/libgdict/Makefile.am
+++ b/mate-dictionary/libgdict/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gdict\" 				\
 	-DLIBDIR=\""$(libdir)"\" 				\
 	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
 	-DPREFIX=\""$(prefix)"\" 				\
-	-DMATELOCALEDIR=\""$(mateutilslocaledir)"\" 		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"			\
 	-DGDICTSOURCESDIR=\""$(datadir)/mate-dict/sources"\" 	\
 	-DGDICT_ENABLE_INTERNALS				\
 	$(NULL)
diff --git a/mate-dictionary/src/Makefile.am b/mate-dictionary/src/Makefile.am
index 31e91340..6eeac251 100644
--- a/mate-dictionary/src/Makefile.am
+++ b/mate-dictionary/src/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
 	-DLIBDIR=\""$(libdir)"\"			\
 	-DDATADIR=\""$(datadir)"\" 			\
 	-DPKGDATADIR=\""$(datadir)/mate-dictionary"\" 	\
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"		\
 	$(NULL)
 
 bin_PROGRAMS = mate-dictionary
diff --git a/mate-disk-image-mounter/src/Makefile.am b/mate-disk-image-mounter/src/Makefile.am
index 49d62803..25c7101f 100644
--- a/mate-disk-image-mounter/src/Makefile.am
+++ b/mate-disk-image-mounter/src/Makefile.am
@@ -6,11 +6,11 @@ mate_disk_image_mounter_SOURCES = 			\
 	main.c						\
 	$(NULL)
 
-mate_disk_image_mounter_CPPFLAGS = 				\
-	-I.							\
-	-I$(srcdir)						\
-	-DG_LOG_DOMAIN=\"mate-disk-image-mounter\"		\
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+mate_disk_image_mounter_CPPFLAGS = 			\
+	-I.						\
+	-I$(srcdir)					\
+	-DG_LOG_DOMAIN=\"mate-disk-image-mounter\"	\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"		\
 	$(NULL)
 
 mate_disk_image_mounter_CFLAGS = 			\
diff --git a/mate-screenshot/src/Makefile.am b/mate-screenshot/src/Makefile.am
index e5104cbd..cabc4b0a 100644
--- a/mate-screenshot/src/Makefile.am
+++ b/mate-screenshot/src/Makefile.am
@@ -1,9 +1,9 @@
 NULL =
 
-AM_CPPFLAGS =							\
-	-I.							\
-	-I$(srcdir)						\
-	-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
+AM_CPPFLAGS =						\
+	-I.						\
+	-I$(srcdir)					\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"		\
 	$(NULL)
 
 bin_PROGRAMS = mate-screenshot
-- 
cgit v1.2.1