b=2502

fix a bug in --disable-doc handling, and add snapfs to DISTDIRS

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index fc9ef85..ec38dc9 100644 (file)
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -22,7 +22,7 @@ if SNAPFS
 SUBDIRS+= snapfs
 endif
 
-DIST_SUBDIRS = $(SUBDIRS) liblustre
+DIST_SUBDIRS = $(SUBDIRS) liblustre snapfs
 EXTRA_DIST = BUGS FDL Rules kernel_patches
 
 # We get the version from the spec file.

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 974a91d..983e7ce 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -62,7 +62,7 @@ Configures openldap server for LDAP Lustre config database
 %setup -qn lustre-%{version}
 #%setup -c -n lustre-%{version}-lib
 %if %{enable_doc}
-  %define disable_doc
+  %define disable_doc ''
 %else
   %define disable_doc --disable-doc
 %endif