diff options
Diffstat (limited to 'trashapplet/data')
3 files changed, 29 insertions, 18 deletions
diff --git a/trashapplet/data/Makefile.am b/trashapplet/data/Makefile.am index 8603d6c2..8449ac6e 100644 --- a/trashapplet/data/Makefile.am +++ b/trashapplet/data/Makefile.am @@ -1,30 +1,40 @@ -appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.TrashApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.TrashAppletFactory.service.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-trash-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/trashapplet +endif !ENABLE_IN_PROCESS + +appletdir = $(datadir)/mate-panel/applets 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|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ + -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) +if !ENABLE_IN_PROCESS +servicedir = $(datadir)/dbus-1/services +service_DATA = $(service_in_files:.service.in=.service) -org.mate.panel.applet.TrashAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ - $< > $@ - -EXTRA_DIST = \ - $(applet_in_files).in \ - $(service_in_files) \ - trashapplet-empty-progress.ui \ - trashapplet-menu.xml \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + $< > $@ +endif !ENABLE_IN_PROCESS + +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) 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..349d2116 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=@APPLET_IN_PROCESS@ +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 index ead24d1d..9a406173 100644 --- a/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in +++ b/trashapplet/data/org.mate.panel.applet.TrashAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.TrashAppletFactory -Exec=@LIBEXECDIR@/trashapplet +Exec=@APPLET_LOCATION@ |