LU-6142 mtd: use tabs to indent struct mdt_thread_info

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

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index 8f1927c..a5ae94c 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -32,10 +32,12 @@
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
+SUBDIRS = resource
+DIST_SUBDIRS = resource
+
 EXTRA_DIST = lustre.dtd lustre2ldif.xsl top.ldif \
              99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \
-            Lustre healthLNET healthLUSTRE \
-             lnet_routes.conf lnet.conf lgssc.conf
+             lnet_routes.conf lnet.conf lgssc.conf 99-lustre-server.rules
 
 sysconf_DATA = lnet.conf
 
@@ -48,8 +50,7 @@ udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
 if SERVER
-pacemakerdir = $(prefix)/lib/ocf/resource.d/lustre
-pacemaker_DATA = healthLNET healthLUSTRE Lustre
+udevrules_DATA += 99-lustre-server.rules
 if ZFS_ENABLED
 sysconf_DATA += ldev.conf
 endif
@@ -58,11 +59,13 @@ sysconfigdir = $(sysconfdir)/sysconfig
 sysconfig_DATA = lustre
 if GSS_KEYRING
 sysconfig_DATA += lsvcgss
-requestkeydir = $(sysconfdir)/request-key.d
-requestkey_DATA = lgssc.conf
 endif
 endif
 endif
+if GSS_KEYRING
+requestkeydir = $(sysconfdir)/request-key.d
+requestkey_DATA = lgssc.conf
+endif
 
 modprobedir = $(sysconfdir)/modprobe.d
 modprobe_DATA = ko2iblnd.conf