summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Ancell <robert.ancell@canonical.com>2018-02-13 15:51:40 +1300
committerRobert Ancell <robert.ancell@canonical.com>2018-02-13 16:27:24 +1300
commitf57919df4f00656c800ffad8a3ba41e3b27ba776 (patch)
tree578b8b798e93e1329aa1c577f10da12d6d00f5c2
parent22a130c5781f95770fbd27325e2ec5092993d474 (diff)
downloadlightdm-git-f57919df4f00656c800ffad8a3ba41e3b27ba776.tar.gz
Correctly install AccountsService interface file as symlink
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am13
2 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 76af6328..7c221d7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,6 +10,8 @@ LT_INIT
AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_LIBTOOL
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
AM_MAINTAINER_MODE
dnl Check if the compiler really supports `-std=c99`.
diff --git a/data/Makefile.am b/data/Makefile.am
index e7d9ac8f..732897e3 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,9 +27,16 @@ dist_apparmor_profile_abstractions_DATA = \
apparmor/abstractions/lightdm \
apparmor/abstractions/lightdm_chromium-browser
-accountsservicedir = $(datadir)/accountsservice/interfaces
-dist_accountsservice_DATA = \
- org.freedesktop.DisplayManager.AccountsService.xml
+accountsservice_interface = org.freedesktop.DisplayManager.AccountsService.xml
+
+dbusdir = $(datadir)/dbus-1/interfaces
+dist_dbus_DATA = \
+ $(accountsservice_interface)
+
+# AccountsService requires D-Bus interfaces to be symlinked
+install-exec-hook:
+ $(MKDIR_P) $(DESTDIR)$(datadir)/accountsservice/interfaces
+ $(LN_S) ../../dbus-1/interfaces/$(accountsservice_interface) $(DESTDIR)$(datadir)/accountsservice/interfaces/$(accountsservice_interface)
polkitdir = $(datadir)/polkit-1/actions
polkit_in_files = org.freedesktop.DisplayManager.AccountsService.policy.in