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
---
 battstat/Makefile.am                                             | 8 ++++----
 battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in | 2 +-
 battstat/org.mate.panel.applet.BattstatAppletFactory.service.in  | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'battstat')

diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index fec3e882..21ff989d 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -35,10 +35,10 @@ AM_CPPFLAGS =					\
 	-DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\"
 
 
-libexec_PROGRAMS = battstat-applet-2
+libexec_PROGRAMS = battstat-applet
 
 
-battstat_applet_2_SOURCES = \
+battstat_applet_SOURCES = \
 	battstat.h \
 	pixmaps.h \
 	properties.c \
@@ -54,7 +54,7 @@ battstat_applet_2_SOURCES = \
 	battstat-upower.h
 
 
-battstat_applet_2_LDADD = \
+battstat_applet_LDADD = \
 		     $(MATE_APPLETS4_LIBS) \
 		     $(MATEDESKTOP_LIBS) \
 		     $(LIBNOTIFY_LIBS) \
@@ -93,7 +93,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files)
 
 CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in)  $(gsettings_SCHEMAS) *.gschema.valid
 
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
 ui_DATA = battstat-applet-menu.xml
 
 EXTRA_DIST = 							\
diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
index f9b6d3ed..9600dfc7 100644
--- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
+++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
 [Applet Factory]
 Id=BattstatAppletFactory
-Location=@LIBEXECDIR@/battstat-applet-2
+Location=@LIBEXECDIR@/battstat-applet
 _Name=Battstat Factory
 _Description=Battstat Factory
 
diff --git a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
index b2983113..050fd3c8 100644
--- a/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
+++ b/battstat/org.mate.panel.applet.BattstatAppletFactory.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.mate.panel.applet.BattstatAppletFactory
-Exec=@LIBEXECDIR@/battstat-applet-2
+Exec=@LIBEXECDIR@/battstat-applet
-- 
cgit v1.2.1