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 8f1927c..634b344 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -32,9 +32,11 @@
 # 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
 
 sysconf_DATA = lnet.conf
@@ -48,8 +50,6 @@ udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
 if SERVER
-pacemakerdir = $(prefix)/lib/ocf/resource.d/lustre
-pacemaker_DATA = healthLNET healthLUSTRE Lustre
 if ZFS_ENABLED
 sysconf_DATA += ldev.conf
 endif