X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2FMakefile.am;h=11194b3d40d6dded37c5de896c47af749eb5a962;hb=37ddfcf5ecc8a11d2d09997249fd56c8dd0a99c1;hp=266acf63ffa78dfd80fb4459e4e28dd76ef03c99;hpb=9bb4c2413323c2bc7bb0686ab6b86f0ca6215781;p=fs%2Flustre-release.git

diff --git a/lustre/Makefile.am b/lustre/Makefile.am
index 266acf6..11194b3 100644
--- a/lustre/Makefile.am
+++ b/lustre/Makefile.am
@@ -5,14 +5,21 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+if LINUX25
+DIRS24 = mds
+else
+DIRS24 = extN mds
+endif
+
 # NOTE: keep extN before mds
-SUBDIRS = lov utils obdclass ldlm ptlrpc llite lib obdecho mdc osc extN 
-SUBDIRS+=  mds ost tests obdfilter demos doc scripts 
+SUBDIRS = lov utils obdclass ldlm ptlrpc lib obdecho mdc osc ost llite 
+SUBDIRS+=   $(DIRS24) obdfilter tests doc scripts 
+
 DIST_SUBDIRS = $(SUBDIRS)
 EXTRA_DIST = BUGS FDL Rules include patches archdep.m4
 
 # We get the version from the spec file.
-configure: scripts/lustre.spec.in
+CONFIGURE_DEPENDENCIES = scripts/lustre.spec.in
 
 dist-hook:
 	find $(distdir) -name .deps | xargs rm -rf
@@ -23,3 +30,4 @@ include $(top_srcdir)/Rules
 rpms: dist Makefile
 	rpm -ta $(distdir).tar.gz
 
+