Branch HEAD

b=15998
i=adilger

Fix make rpms on HEAD.

autoMakefile.am

 SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
 DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre 
 SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-RPM_SUBDIRS := @LDISKFS_SUBDIR@
+RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 if LDISKFS_ENABLED
 EXTRA_SOURCES := @SYMVERFILE@
 endif

build/autoMakefile.am.toplevel

@@ -60,6 +60,7 @@ endif # MODULES
 
 dist-hook:
 	rm -f $(distdir)/ldiskfs/*.spec
+	rm -f $(distdir)/lustre-iokit/*.spec
 	find $(distdir) -name .deps -o \
 			-name CVS -o \
 			-name .svn -o \

lustre-iokit/Makefile.am

 SUBDIRS = obdfilter-survey sgpdd-survey ost-survey ior-survey stats-collect
 
-EXTRA_DIST = lustre-iokit.spec
+EXTRA_DIST = lustre-iokit.spec 
 
-rpm: dist
+rpms rpm: dist
 	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz