diff options
| author | Richard Hughes <richard@hughsie.com> | 2015-10-13 18:38:38 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2015-10-14 18:18:36 +0100 |
| commit | 35ec2e01630fabac826645c2dfbd61fb9d71ee16 (patch) | |
| tree | 6467dad45efd73e288f8af7e8fa7d4ffc2bac9a6 | |
| parent | 83fb8a5076df66d0045161b1defb110e5471e0cb (diff) | |
| download | colord-35ec2e01630fabac826645c2dfbd61fb9d71ee16.tar.gz | |
Install the tmpfiles.d snippet in the right place
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | data/Makefile.am | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 363527c..ef21112 100644 --- a/configure.ac +++ b/configure.ac @@ -254,6 +254,17 @@ if test "x$with_systemdsystemunitdir" != "xno"; then fi AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) +dnl --------------------------------------------------------------------------- +dnl - Where to install tmpfiles.d snippet rules +dnl --------------------------------------------------------------------------- +AC_ARG_WITH([tmpfilesdir], + AS_HELP_STRING([--with-tmpfilesdir=DIR], [Directory for tmpfiles.d snippet files]), + [], + [with_tmpfilesdir=$($PKG_CONFIG --variable=tmpfilesdir systemd)]) +if test "x$with_tmpfilesdir" != "xno"; then + AC_SUBST([tmpfilesdir], [$with_tmpfilesdir]) +fi + dnl **** Check if we should build libcolordcompat **** AC_ARG_ENABLE(libcolordcompat, AS_HELP_STRING([--enable-libcolordcompat], [Enable libcolordcompat.so which is used by ArgyllCMS]), @@ -508,6 +519,7 @@ echo " udev rules.d dir: ${with_udevrulesdir} systemd-login support: ${enable_systemd_login} systemd service dir: ${with_systemdsystemunitdir} + tmpfiles.d dir: ${with_tmpfilesdir} Unix support: ${enable_unix} " diff --git a/data/Makefile.am b/data/Makefile.am index 5b82cc0..bdf8fd6 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,7 +21,6 @@ $(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile systemdservicemain_in_files = colord.service.in -tmpfilesdir = $(libdir)/tmpfiles.d/colord.conf dist_tmpfiles_DATA = colord.conf endif |