X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconf%2FMakefile.am;h=a5ae94cec6ac4fc09fab5117005b353eaa9dad9c;hb=f843facff59226d3788d855d1d6948523ab8d944;hp=a150daf36df02d2ca69138508d70c970eefa33e2;hpb=c543f5db670c20106e93e77526808598c44baa4f;p=fs%2Flustre-release.git

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index a150daf..a5ae94c 100644
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -32,9 +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 \
-             lnet_routes.conf lnet.conf lgssc.conf
+             lnet_routes.conf lnet.conf lgssc.conf 99-lustre-server.rules
 
 sysconf_DATA = lnet.conf
 
@@ -47,6 +50,7 @@ udevrulesdir = $(sysconfdir)/udev/rules.d
 udevrules_DATA = 99-lustre.rules
 
 if SERVER
+udevrules_DATA += 99-lustre-server.rules
 if ZFS_ENABLED
 sysconf_DATA += ldev.conf
 endif
@@ -55,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