diff options
Diffstat (limited to 'mate-dictionary/data')
| -rw-r--r-- | mate-dictionary/data/Makefile.am | 12 | ||||
| -rw-r--r-- | mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am index 81cfcd35..b174a877 100644 --- a/mate-dictionary/data/Makefile.am +++ b/mate-dictionary/data/Makefile.am @@ -62,9 +62,17 @@ appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.DictionaryApplet.mate-panel-applet.desktop.in applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) +if ENABLE_IN_PROCESS +APPLET_LOCATION = $(pkglibdir)/libmate-dictionary-applet.so +APPLET_IN_PROCESS = true +else +APPLET_LOCATION = $(libexecdir)/mate-dictionary-applet +APPLET_IN_PROCESS = false +endif $(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)|" \ $< > $@ $(applet_DATA): $(applet_in_files) Makefile @@ -74,6 +82,7 @@ else $(AM_V_GEN) cp $< $@ endif +if !ENABLE_IN_PROCESS servicedir = $(datadir)/dbus-1/services service_in_files = org.mate.panel.applet.DictionaryAppletFactory.service.in service_DATA = $(service_in_files:.service.in=.service) @@ -82,6 +91,7 @@ org.mate.panel.applet.DictionaryAppletFactory.service: $(service_in_files) $(AM_V_GEN)sed \ -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ +endif ui_DATA += dictionary-applet-menu.xml diff --git a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in index db553811..2e74c413 100644 --- a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in +++ b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in @@ -1,6 +1,7 @@ [Applet Factory] Id=DictionaryAppletFactory -Location=@LIBEXECDIR@/mate-dictionary-applet +Location=@APPLET_LOCATION@ +InProcess=@APPLET_IN_PROCESS@ Name=Dictionary Applet Factory Description=Factory for the dictionary applet |