diff options
| author | Michael Catanzaro <mcatanzaro@gnome.org> | 2015-03-23 21:27:39 -0500 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-06-29 16:49:47 +0200 |
| commit | a4f42f853071d0200611b0c575f5454467b944d9 (patch) | |
| tree | d76e1694761198fda06820d6a9377befa4a855f5 | |
| parent | 9dd9c47f5db9b05656a13bee1330f2353b184805 (diff) | |
| download | udisks-a4f42f853071d0200611b0c575f5454467b944d9.tar.gz | |
Install udisksd into a libexecdir
$(prefix)/lib means the binary could wind up under e.g. /usr/lib rather
than /usr/lib64, or other more appropriate locations depending on the
distro.
https://bugs.freedesktop.org/show_bug.cgi?id=89736
| -rw-r--r-- | data/Makefile.am | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 0921698..3d6329d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,7 @@ dbusservice_in_files = org.freedesktop.UDisks2.service.in dbusservice_DATA = $(dbusservice_in_files:.service.in=.service) $(dbusservice_DATA): $(dbusservice_in_files) Makefile - @sed -e "s|\@udisksdprivdir\@|$(prefix)/lib/udisks2|" $< > $@ + @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@ dbusconfdir = $(sysconfdir)/dbus-1/system.d dbusconf_in_files = org.freedesktop.UDisks2.conf.in @@ -22,7 +22,7 @@ systemdservicedir = $(systemdsystemunitdir) systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) $(systemdservice_DATA): $(systemdservice_in_files) Makefile - @sed -e "s|\@udisksdprivdir\@|$(prefix)/lib/udisks2|" $< > $@ + @sed -e "s|\@udisksdprivdir\@|$(libexecdir)/udisks2|" $< > $@ endif udevrulesdir = $(udevdir)/rules.d diff --git a/src/Makefile.am b/src/Makefile.am index 1b12c37..c933330 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -106,7 +106,7 @@ libudisks_daemon_la_LIBADD = \ # ---------------------------------------------------------------------------------------------------- -udisksdprivdir = $(prefix)/lib/udisks2 +udisksdprivdir = $(libexecdir)/udisks2 udisksdpriv_PROGRAMS = udisksd udisksd_SOURCES = \ |