From 0d372c1a0ae345d8ebbc69c52e9d55165e766109 Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Mon, 27 Jan 2020 12:53:27 +0100
Subject: automake: do not include CFLAGS in CPPFLAGS

---
 sendto/plugins/upnp/Makefile.am | 35 +++++++++++++++++++++++------------
 sendto/plugins/upnp/upnp.c      |  2 +-
 2 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'sendto/plugins/upnp')

diff --git a/sendto/plugins/upnp/Makefile.am b/sendto/plugins/upnp/Makefile.am
index 31a8bd6..9544d49 100644
--- a/sendto/plugins/upnp/Makefile.am
+++ b/sendto/plugins/upnp/Makefile.am
@@ -1,19 +1,30 @@
-plugindir = $(libdir)/caja-sendto/plugins
+NULL =
+
+AM_CPPFLAGS =					\
+	$(DISABLE_DEPRECATED_CPPFLAGS)		\
+	-DMATELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)/sendto			\
+	$(NULL)
 
-AM_CPPFLAGS =                                      \
-        -DDATADIR=\"$(datadir)\"                \
-        -DICONDIR=\"$(icondir)\"                \
-	-DLOCALEDIR="\"$(datadir)/locale\""	\
-        -I$(top_srcdir)/sendto                  \
-        -I$(top_builddir)                       \
-        $(SENDTO_CFLAGS)               \
-	$(UPNP_CFLAGS)                          \
-	$(DISABLE_DEPRECATED)			\
-	$(WARN_CFLAGS)
+AM_CFLAGS =					\
+	$(WARN_CFLAGS)				\
+	$(SENDTO_CFLAGS)			\
+	$(NULL)
+
+plugindir = $(libdir)/caja-sendto/plugins
 
 plugin_LTLIBRARIES = libnstupnp.la
 
 libnstupnp_la_SOURCES = upnp.c
+libnstupnp_la_CPPFLAGS =			\
+	$(AM_CPPFLAGS)				\
+	-DDATADIR=\"$(datadir)\"		\
+	-DICONDIR=\"$(icondir)\"		\
+	$(NULL)
+libnstupnp_la_CFLAGS =				\
+	$(AM_CFLAGS)				\
+	$(UPNP_CFLAGS)				\
+	$(NULL)
 libnstupnp_la_LDFLAGS = -module -avoid-version
 libnstupnp_la_LIBADD = $(UPNP_LIBS) $(SENDTO_LIBS)
-
diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c
index 81a4f0a..4c09e66 100644
--- a/sendto/plugins/upnp/upnp.c
+++ b/sendto/plugins/upnp/upnp.c
@@ -198,7 +198,7 @@ init (NstPlugin *plugin)
 	GtkCellRenderer *renderer;
 	char *upload_cmd;
 
-	bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+	bindtextdomain (GETTEXT_PACKAGE, MATELOCALEDIR);
 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 
 	upload_cmd = g_find_program_in_path ("gupnp-upload");
-- 
cgit v1.2.1