From 0f858316b3a3128b696fb37428cc5699f1b5d3c9 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Wed, 25 Jun 2014 12:35:39 +0200
Subject: Use $(datadir)/mate instead of $(datadir)/mate-2.0

And also rename binaries without "-2" suffix
---
 charpick/Makefile.am                                              | 8 ++++----
 .../org.mate.applets.CharpickerApplet.mate-panel-applet.in.in     | 2 +-
 charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'charpick')

diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index c2608e8e..365fae44 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -8,13 +8,13 @@ AM_CPPFLAGS =					\
 	$(MATEDESKTOP_CFLAGS)		\
 	$(GUCHARMAP_CFLAGS)
 
-libexec_PROGRAMS = charpick_applet2
+libexec_PROGRAMS = charpick-applet
 
-charpick_applet2_SOURCES = charpick.c \
+charpick_applet_SOURCES = charpick.c \
                           charpick.h \
                           properties.c
 
-charpick_applet2_LDADD = \
+charpick_applet_LDADD = \
 		       $(MATE_APPLETS4_LIBS)	\
 		       $(MATEDESKTOP_LIBS)	\
 		       $(GUCHARMAP_LIBS)
@@ -47,7 +47,7 @@ gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml
 %.gschema.xml.in: %.gschema.xml.in.in Makefile
 	$(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = charpick-applet-menu.xml
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
diff --git a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
index c7160c71..f7a9d2b0 100644
--- a/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
+++ b/charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=CharpickerAppletFactory
-Location=@LIBEXECDIR@/charpick_applet2
+Location=@LIBEXECDIR@/charpick-applet
 _Name=Charpicker Applet Factory
 _Description=Charpicker Applet Factory
 
diff --git a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
index 66669019..bfca2847 100644
--- a/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
+++ b/charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.CharpickerAppletFactory
-Exec=@LIBEXECDIR@/charpick_applet2
+Exec=@LIBEXECDIR@/charpick-applet
-- 
cgit v1.2.1