diff options
Diffstat (limited to 'accessx-status/data')
3 files changed, 19 insertions, 7 deletions
diff --git a/accessx-status/data/Makefile.am b/accessx-status/data/Makefile.am index 58df0294..357ef0fd 100644 --- a/accessx-status/data/Makefile.am +++ b/accessx-status/data/Makefile.am @@ -1,26 +1,36 @@ NULL = -appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in +service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in + +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-accessx-status-applet.so +else !ENABLE_IN_PROCESS +APPLET_LOCATION = $(libexecdir)/accessx-status-applet +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|\@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 $@ +if !ENABLE_IN_PROCESS servicedir = $(datadir)/dbus-1/services -service_in_files = org.mate.panel.applet.AccessxStatusAppletFactory.service.in service_DATA = $(service_in_files:.service.in=.service) -org.mate.panel.applet.AccessxStatusAppletFactory.service: $(service_in_files) +$(service_DATA): $(service_in_files) Makefile $(AM_V_GEN)sed \ - -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ + -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ +endif !ENABLE_IN_PROCESS CLEANFILES = \ $(applet_DATA) \ diff --git a/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in b/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in index 9d9200a7..7f4b5e3e 100644 --- a/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in +++ b/accessx-status/data/org.mate.applets.AccessxStatusApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=AccessxStatusAppletFactory -Location=@LIBEXECDIR@/accessx-status-applet +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=AccessX Status Applet Factory Description=Keyboard Accessibility Status Applet Factory @@ -10,6 +11,7 @@ Description=Shows the status of keyboard accessibility features # Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=preferences-desktop-accessibility MateComponentId=OAFIID:MATE_AccessxStatusApplet +Platforms=X11; X-MATE-Bugzilla-Bugzilla=MATE X-MATE-Bugzilla-Product=mate-applets X-MATE-Bugzilla-Component=keyboard-accessibility (accessx-status) diff --git a/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in b/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in index 7f5d055e..84abc933 100644 --- a/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in +++ b/accessx-status/data/org.mate.panel.applet.AccessxStatusAppletFactory.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.mate.panel.applet.AccessxStatusAppletFactory -Exec=@LIBEXECDIR@/accessx-status-applet +Exec=@APPLET_LOCATION@ |