diff options
| author | Stefano Karapetsas <[email protected]> | 2014-06-25 12:35:39 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-06-25 12:35:39 +0200 |
| commit | 0f858316b3a3128b696fb37428cc5699f1b5d3c9 (patch) | |
| tree | a998f19fd57671435ff33a9008297a49364c6b0b /geyes | |
| parent | 739798f436d6c1de93179a98b70962748dde9ca9 (diff) | |
| download | mate-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 'geyes')
| -rw-r--r-- | geyes/Makefile.am | 8 | ||||
| -rw-r--r-- | geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in | 2 | ||||
| -rw-r--r-- | geyes/org.mate.panel.applet.GeyesAppletFactory.service.in | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/geyes/Makefile.am b/geyes/Makefile.am index ba9750c8..d23fa119 100644 --- a/geyes/Makefile.am +++ b/geyes/Makefile.am @@ -9,14 +9,14 @@ AM_CPPFLAGS = \ -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \ -DGEYES_MENU_UI_DIR=\""$(uidir)"\" -libexec_PROGRAMS = geyes_applet2 +libexec_PROGRAMS = geyes-applet -geyes_applet2_SOURCES = \ +geyes_applet_SOURCES = \ geyes.c \ themes.c \ geyes.h -geyes_applet2_LDADD = \ +geyes_applet_LDADD = \ $(MATE_APPLETS4_LIBS) \ $(MATEDESKTOP_LIBS) \ -lm @@ -42,7 +42,7 @@ org.mate.panel.applet.GeyesAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -uidir = $(datadir)/mate-2.0/ui +uidir = $(datadir)/mate/ui ui_DATA = geyes-applet-menu.xml @INTLTOOL_XML_NOMERGE_RULE@ diff --git a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in index d512ed20..d2080905 100644 --- a/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in +++ b/geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in @@ -1,6 +1,6 @@ [Applet Factory] Id=GeyesAppletFactory -Location=@LIBEXECDIR@/geyes_applet2 +Location=@LIBEXECDIR@/geyes-applet _Name=Geyes Applet Factory _Description=Geyes Applet Factory diff --git a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in index 783f42b4..f1363812 100644 --- a/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in +++ b/geyes/org.mate.panel.applet.GeyesAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.GeyesAppletFactory -Exec=@LIBEXECDIR@/geyes_applet2 +Exec=@LIBEXECDIR@/geyes-applet |