summaryrefslogtreecommitdiff
path: root/mateweather
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-06-25 12:35:39 +0200
committerStefano Karapetsas <[email protected]>2014-06-25 12:35:39 +0200
commit0f858316b3a3128b696fb37428cc5699f1b5d3c9 (patch)
treea998f19fd57671435ff33a9008297a49364c6b0b /mateweather
parent739798f436d6c1de93179a98b70962748dde9ca9 (diff)
downloadmate-applets-0f858316b3a3128b696fb37428cc5699f1b5d3c9.tar.bz2
mate-applets-0f858316b3a3128b696fb37428cc5699f1b5d3c9.tar.xz
Use $(datadir)/mate instead of $(datadir)/mate-2.0mate-applets-1.9.0
And also rename binaries without "-2" suffix
Diffstat (limited to 'mateweather')
-rw-r--r--mateweather/Makefile.am8
-rw-r--r--mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in2
-rw-r--r--mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in2
3 files changed, 6 insertions, 6 deletions
diff --git a/mateweather/Makefile.am b/mateweather/Makefile.am
index d94173d2..db2f004c 100644
--- a/mateweather/Makefile.am
+++ b/mateweather/Makefile.am
@@ -13,9 +13,9 @@ AM_CPPFLAGS = \
$(NETWORKMANAGER_CFLAGS) \
$(DBUS_CFLAGS)
-libexec_PROGRAMS = mateweather-applet-2
+libexec_PROGRAMS = mateweather-applet
-mateweather_applet_2_SOURCES = \
+mateweather_applet_SOURCES = \
mateweather.h \
main.c \
mateweather-about.c mateweather-about.h \
@@ -23,7 +23,7 @@ mateweather_applet_2_SOURCES = \
mateweather-dialog.c mateweather-dialog.h \
mateweather-applet.c mateweather-applet.h
-mateweather_applet_2_LDADD = \
+mateweather_applet_LDADD = \
$(LIBNOTIFY_LIBS) \
$(MATE_APPLETS4_LIBS) \
$(MATEDESKTOP_LIBS) \
@@ -32,7 +32,7 @@ mateweather_applet_2_LDADD = \
$(NETWORKMANAGER_LIBS) \
$(DBUS_LIBS)
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
ui_DATA = mateweather-applet-menu.xml
appletdir = $(datadir)/mate-panel/applets
diff --git a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
index af58a727..c0a1a4f6 100644
--- a/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
+++ b/mateweather/org.mate.applets.MateWeatherApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=MateWeatherAppletFactory
-Location=@LIBEXECDIR@/mateweather-applet-2
+Location=@LIBEXECDIR@/mateweather-applet
_Name=Mateweather Applet Factory
_Description=Factory for creating the weather applet.
diff --git a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
index 2be7b633..e1d0174a 100644
--- a/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
+++ b/mateweather/org.mate.panel.applet.MateWeatherAppletFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.MateWeatherAppletFactory
-Exec=@LIBEXECDIR@/mateweather-applet-2
+Exec=@LIBEXECDIR@/mateweather-applet