diff options
Diffstat (limited to 'cpufreq/data')
3 files changed, 7 insertions, 17 deletions
diff --git a/cpufreq/data/Makefile.am b/cpufreq/data/Makefile.am index b08d6345..c4423f90 100644 --- a/cpufreq/data/Makefile.am +++ b/cpufreq/data/Makefile.am @@ -4,39 +4,31 @@ cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ +APPLET_LOCATION = $(libdir)/mate-applets/libmatecpufreqapplet.so + appletdir = $(datadir)/mate-panel/applets 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 \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ - $< > $@ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ + $< > $@ $(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 -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.CPUFreqAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ CLEANFILES = \ $(applet_DATA) \ $(applet_in_files) \ - $(service_DATA) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(NULL) EXTRA_DIST = \ $(applet_in_files).in \ - $(service_in_files) \ $(cpufreq_gschema_in_files) \ cpufreq-applet-menu.xml \ cpufreq-preferences.ui \ diff --git a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in index 168c6317..fd548154 100644 --- a/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in +++ b/cpufreq/data/org.mate.applets.CPUFreqApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=CPUFreqAppletFactory -Location=@LIBEXECDIR@/mate-cpufreq-applet +InProcess=true +Location=@APPLET_LOCATION@ Name=CPU Frequency Scaling Monitor Description=Monitor the CPU Frequency Scaling diff --git a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in b/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in deleted file mode 100644 index a04c672b..00000000 --- a/cpufreq/data/org.mate.panel.applet.CPUFreqAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.CPUFreqAppletFactory -Exec=@LIBEXECDIR@/mate-cpufreq-applet |