diff options
Diffstat (limited to 'command/data')
3 files changed, 22 insertions, 12 deletions
diff --git a/command/data/Makefile.am b/command/data/Makefile.am index b94e9523..47709166 100644 --- a/command/data/Makefile.am +++ b/command/data/Makefile.am @@ -1,34 +1,42 @@ +applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.CommandAppletFactory.service.in +gschema_in_files = org.mate.panel.applet.command.gschema.xml.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libcommand-applet.so +else !ENABLE_IN_PROCESS APPLET_LOCATION = $(libexecdir)/command-applet +endif !ENABLE_IN_PROCESS appletsdir = $(datadir)/mate-panel/applets -applets_in_files = org.mate.applets.CommandApplet.mate-panel-applet.desktop.in applets_DATA = $(applets_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applets_in_files): $(applets_in_files).in Makefile $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_IN_PROCESS\@|$(APPLET_IN_PROCESS)|" \ $< > $@ $(applets_DATA): $(applets_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.CommandAppletFactory.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.CommandAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ +endif !ENABLE_IN_PROCESS -command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in -gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml) +gsettings_SCHEMAS = $(gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ EXTRA_DIST = \ $(applets_in_files).in \ $(service_in_files) \ - $(command_gschema_in_files) \ + $(gschema_in_files) \ command-preferences.ui \ command-resources.gresource.xml diff --git a/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in index 04f76f4a..6d14aedb 100644 --- a/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in +++ b/command/data/org.mate.applets.CommandApplet.mate-panel-applet.desktop.in.in @@ -1,11 +1,13 @@ [Applet Factory] Id=CommandAppletFactory -Location=@LOCATION@ +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=Command Factory Description=Command Factory [CommandApplet] Name=Command Description=Shows the output of a command +Platforms=X11;Wayland; # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=utilities-terminal diff --git a/command/data/org.mate.panel.applet.CommandAppletFactory.service.in b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in index a4e04846..aad043dd 100644 --- a/command/data/org.mate.panel.applet.CommandAppletFactory.service.in +++ b/command/data/org.mate.panel.applet.CommandAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.CommandAppletFactory -Exec=@LOCATION@ +Exec=@APPLET_LOCATION@ |