diff options
author | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
---|---|---|
committer | Stefano Karapetsas <[email protected]> | 2012-12-15 12:33:17 -0800 |
commit | 85c5ae14d75e3413b8f3f3aa38205ea852dcb20d (patch) | |
tree | 4750b8d23dfcb17aea6cbc62c7e1c788a6976a7b /data | |
parent | 12dcf19aa5f51901053c273cd7f5c17ce85e909d (diff) | |
parent | c6a6cbde72489a0055ba63341a153fe365058072 (diff) | |
download | mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.bz2 mate-settings-daemon-85c5ae14d75e3413b8f3f3aa38205ea852dcb20d.tar.xz |
Merge pull request #31 from jasmineaura/develop
background revised, various other fixes & improvements
Diffstat (limited to 'data')
-rw-r--r-- | data/Makefile.am | 2 | ||||
-rw-r--r-- | data/mate-settings-daemon-uninstalled.pc.in | 1 | ||||
-rw-r--r-- | data/mate-settings-daemon.pc.in | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 975daf9..3ba2e7e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -35,7 +35,7 @@ service_in_files = org.mate.SettingsDaemon.service.in service_DATA = $(service_in_files:.service.in=.service) org.mate.SettingsDaemon.service: org.mate.SettingsDaemon.service.in Makefile - @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = mate-settings-daemon.pc diff --git a/data/mate-settings-daemon-uninstalled.pc.in b/data/mate-settings-daemon-uninstalled.pc.in index 29bcd91..89dadcd 100644 --- a/data/mate-settings-daemon-uninstalled.pc.in +++ b/data/mate-settings-daemon-uninstalled.pc.in @@ -2,6 +2,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ +binary=${pc_top_builddir}/mate-settings-daemon/mate-settings-daemon Name: mate-settings-daemon Description: Utility library for accessing mate-settings-daemon over DBUS diff --git a/data/mate-settings-daemon.pc.in b/data/mate-settings-daemon.pc.in index 764ffdb..26bde7e 100644 --- a/data/mate-settings-daemon.pc.in +++ b/data/mate-settings-daemon.pc.in @@ -4,6 +4,7 @@ libdir=@libdir@ includedir=@includedir@ libexecdir=@libexecdir@ plugindir=${libdir}/mate-settings-daemon-2.0 +binary=${libexecdir}/mate-settings-daemon Name: mate-settings-daemon Description: Utility library for accessing mate-settings-daemon over DBUS |