summaryrefslogtreecommitdiff
path: root/multiload
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 /multiload
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 'multiload')
-rw-r--r--multiload/Makefile.am8
-rw-r--r--multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in2
-rw-r--r--multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in2
3 files changed, 6 insertions, 6 deletions
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index e6073c5b..43b238e4 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = \
$(MATEDESKTOP_CFLAGS) \
$(GIO_CFLAGS)
-libexec_PROGRAMS = multiload-applet-2
+libexec_PROGRAMS = multiload-applet
-multiload_applet_2_SOURCES = \
+multiload_applet_SOURCES = \
global.h \
linux-proc.h \
load-graph.h \
@@ -22,7 +22,7 @@ multiload_applet_2_SOURCES = \
autoscaler.c \
autoscaler.h
-multiload_applet_2_LDADD = \
+multiload_applet_LDADD = \
$(MATE_APPLETS4_LIBS) \
$(GTOP_APPLETS_LIBS) \
$(MATEDESKTOP_LIBS) \
@@ -42,7 +42,7 @@ EXTRA_DIST = \
$(gsettings_SCHEMAS).in.in \
$(ui_DATA)
-uidir = $(datadir)/mate-2.0/ui
+uidir = $(datadir)/mate/ui
ui_DATA = multiload-applet-menu.xml
appletdir = $(datadir)/mate-panel/applets
diff --git a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
index f62ca12b..584b0c03 100644
--- a/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
+++ b/multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in
@@ -1,6 +1,6 @@
[Applet Factory]
Id=MultiLoadAppletFactory
-Location=@LIBEXECDIR@/multiload-applet-2
+Location=@LIBEXECDIR@/multiload-applet
Name=MultiLoad Applet Factory
Description=Factory for creating the load applet.
diff --git a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
index 8c37aecd..f592f048 100644
--- a/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
+++ b/multiload/org.mate.panel.applet.MultiLoadAppletFactory.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.mate.panel.applet.MultiLoadAppletFactory
-Exec=@LIBEXECDIR@/multiload-applet-2
+Exec=@LIBEXECDIR@/multiload-applet