diff options
Diffstat (limited to 'trashapplet/data')
3 files changed, 8 insertions, 17 deletions
diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am index 8603d6c2..f318e0fb 100644 --- a/trashapplet/data/Makefile.am +++ b/trashapplet/data/Makefile.am @@ -1,32 +1,25 @@ +APPLET_LOCATION = $(libdir)/mate-applets/libtrashapplet.so + appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.TrashApplet.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.TrashAppletFactory.service.in -service_DATA = $(service_in_files:.service.in=.service) - -org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) - $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ EXTRA_DIST = \ $(applet_in_files).in \ - $(service_in_files) \ trashapplet-empty-progress.ui \ trashapplet-menu.xml \ trashapplet-resources.gresource.xml -CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) +CLEANFILES = $(applet_DATA) $(applet_in_files) -include $(top_srcdir)/git.mk diff --git a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in index 77161ccc..d62a5a74 100644 --- a/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in +++ b/trashapplet/data/org.mate.applets.TrashApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=TrashAppletFactory -Location=@LIBEXECDIR@/trashapplet +InProcess=true +Location=@APPLET_LOCATION@ Name=Trash Applet Factory Description=Trash Applet Factory diff --git a/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in deleted file mode 100644 index ead24d1d..00000000 --- a/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.mate.panel.applet.TrashAppletFactory -Exec=@LIBEXECDIR@/trashapplet |