1 files changed, 10 insertions, 13 deletions
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index af18f188..f8136efc 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -1,13 +1,12 @@
 SUBDIRS = help pixmaps src
 
-@INTLTOOL_XML_NOMERGE_RULE@
 cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in
 gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 $(AM_V_GEN)sed \
@@ -15,7 +14,8 @@ $(applet_in_files): $(applet_in_files).in Makefile
 -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
 $< > $@
 
-%.mate-panel-applet: %.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 servicedir = $(datadir)/dbus-1/services
 service_in_files = org.mate.panel.applet.CPUFreqAppletFactory.service.in
@@ -33,7 +33,7 @@ ui_DATA = cpufreq-applet-menu.xml
 
 CLEANFILES = \
 $(applet_DATA) \
- $(applet_DATA).in \
+ $(applet_in_files) \
 $(service_DATA) \
 $(gsettings_SCHEMAS) \
 *.gschema.valid \
@@ -41,13 +41,10 @@ CLEANFILES = \
 *.gladep
 
 EXTRA_DIST = \
- org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in \
- $(service_in_files) \
- $(cpufreq_gschema_in_files) \
- $(builder_DATA) \
- $(ui_DATA)
- 
- 
-
+ $(applet_in_files).in \
+ $(service_in_files) \
+ $(cpufreq_gschema_in_files) \
+ $(builder_DATA) \
+ $(ui_DATA)
 
 -include $(top_srcdir)/git.mk