LU-10752 build: properly package lsvcgss for rpm builds

[fs/lustre-release.git] / lustre / conf / Makefile.am

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 562a352..59b1005 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \
              lnet_routes.conf lnet.conf
 ldapconfdir = $(sysconfdir)/openldap
 
-sysconf_DATA = ldev.conf
+sysconf_DATA = lnet.conf
 
 if UTILS
 noinst_SCRIPTS = slapd-lustre.conf
@@ -48,15 +48,17 @@ endif
 udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
-if RHEL
 if SERVER
+if ZFS_ENABLED
+sysconf_DATA += ldev.conf
+endif
+if RHEL
 sysconfigdir = $(sysconfdir)/sysconfig
-sysconfig_DATA = lustre lsvcgss
+sysconfig_DATA = lustre
+if GSS_KEYRING
+sysconfig_DATA += lsvcgss
 endif
 endif
-
-if BUILD_DLC
-sysconf_DATA += lnet.conf
 endif
 
 modprobedir = $(sysconfdir)/modprobe.d