LU-11455 build: Remove conflicting lustre and Lustre

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

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index c3626ba..634b344 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -32,15 +32,16 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \
+SUBDIRS = resource
+DIST_SUBDIRS = resource
+
+EXTRA_DIST = lustre.dtd lustre2ldif.xsl top.ldif \
              99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \
-             lnet_routes.conf lnet.conf
-ldapconfdir = $(sysconfdir)/openldap
+             lnet_routes.conf lnet.conf lgssc.conf
 
 sysconf_DATA = lnet.conf
 
 if UTILS
-noinst_SCRIPTS = slapd-lustre.conf
 noinst_DATA = top.ldif lustre2ldif.xsl
 sysconf_DATA += lnet_routes.conf
 endif
@@ -54,7 +55,12 @@ sysconf_DATA += ldev.conf
 endif
 if RHEL
 sysconfigdir = $(sysconfdir)/sysconfig
-sysconfig_DATA = lustre lsvcgss
+sysconfig_DATA = lustre
+if GSS_KEYRING
+sysconfig_DATA += lsvcgss
+requestkeydir = $(sysconfdir)/request-key.d
+requestkey_DATA = lgssc.conf
+endif
 endif
 endif