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 /charpick | |
| 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 'charpick')
| -rw-r--r-- | charpick/Makefile.am | 8 | ||||
| -rw-r--r-- | charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in | 2 | ||||
| -rw-r--r-- | charpick/org.mate.panel.applet.CharpickerAppletFactory.service.in | 2 |
3 files changed, 6 insertions, 6 deletions
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 |