summary refs log tree commit diff
path: root/gnu/packages/patches/sssd-system-directories.patch
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/patches/sssd-system-directories.patch')
-rw-r--r--gnu/packages/patches/sssd-system-directories.patch19
1 files changed, 5 insertions, 14 deletions
diff --git a/gnu/packages/patches/sssd-system-directories.patch b/gnu/packages/patches/sssd-system-directories.patch
index ce0dcf5d4d..cc37ac6024 100644
--- a/gnu/packages/patches/sssd-system-directories.patch
+++ b/gnu/packages/patches/sssd-system-directories.patch
@@ -2,19 +2,10 @@ Do not attempt to create $localstatedir and $sysconfdir (i.e., /var and /etc)
 upon "make install".
 
 diff --git a/Makefile.am b/Makefile.am
-index 0de53a2c8..51ad57bf1 100644
+index e780e8a14..afd2b0a49 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -58,7 +58,7 @@ sssddatadir = $(datadir)/sssd
- sssdapiplugindir = $(sssddatadir)/sssd.api.d
- sssdtapscriptdir = $(sssddatadir)/systemtap
- krb5snippetsdir = $(sssddatadir)/krb5-snippets
--dbuspolicydir = $(sysconfdir)/dbus-1/system.d
-+dbuspolicydir = $(prefix)/etc/dbus-1/system.d
- dbusservicedir = $(datadir)/dbus-1/system-services
- sss_statedir = $(localstatedir)/lib/sss
- runstatedir = @runstatedir@
-@@ -85,7 +85,7 @@ pkgconfigdir = $(libdir)/pkgconfig
+@@ -84,7 +84,7 @@ pkgconfigdir = $(libdir)/pkgconfig
  krb5rcachedir = @krb5rcachedir@
  sudolibdir = @sudolibpath@
  polkitdir = @polkitdir@
@@ -23,7 +14,7 @@ index 0de53a2c8..51ad57bf1 100644
  systemtap_tapdir = @tapset_dir@
  sssdkcmdatadir = $(datadir)/sssd-kcm
  deskprofilepath = $(sss_statedir)/deskprofile
-@@ -5195,7 +5195,6 @@ installsssddirs::
+@@ -5378,7 +5378,6 @@ installsssddirs::
      $(DESTDIR)$(bindir) \
      $(DESTDIR)$(sbindir) \
      $(DESTDIR)$(mandir) \
@@ -31,7 +22,7 @@ index 0de53a2c8..51ad57bf1 100644
      $(DESTDIR)$(pluginpath) \
      $(DESTDIR)$(libdir)/ldb \
      $(DESTDIR)$(dbuspolicydir) \
-@@ -5205,24 +5204,12 @@ installsssddirs::
+@@ -5388,24 +5387,12 @@ installsssddirs::
      $(DESTDIR)$(sssddatadir) \
      $(DESTDIR)$(sudolibdir) \
      $(DESTDIR)$(autofslibdir) \
@@ -56,7 +47,7 @@ index 0de53a2c8..51ad57bf1 100644
  
  if HAVE_DOXYGEN
  docs:
-@@ -5338,7 +5325,6 @@ if BUILD_SAMBA
+@@ -5523,7 +5510,6 @@ if BUILD_SAMBA
  endif
  if BUILD_KCM
  	$(MKDIR_P) $(DESTDIR)/$(sssdkcmdatadir)