Branch HEAD

b=15998
i=adilger

Fix make rpms on HEAD.

diff --git a/autoMakefile.am b/autoMakefile.am
index 6601397..2a9976f 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,7 +1,7 @@
 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
 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
 if LDISKFS_ENABLED
 EXTRA_SOURCES := @SYMVERFILE@
 endif

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index dfb9624..3547b40 100644 (file)
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -60,6 +60,7 @@ endif # MODULES
 
 dist-hook:
        rm -f $(distdir)/ldiskfs/*.spec
 
 dist-hook:
        rm -f $(distdir)/ldiskfs/*.spec

+       rm -f $(distdir)/lustre-iokit/*.spec

        find $(distdir) -name .deps -o \
                        -name CVS -o \
                        -name .svn -o \
        find $(distdir) -name .deps -o \
                        -name CVS -o \
                        -name .svn -o \

diff --git a/lustre-iokit/Makefile.am b/lustre-iokit/Makefile.am
index c2bcb86..a654ff6 100644 (file)
--- a/lustre-iokit/Makefile.am
+++ b/lustre-iokit/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = obdfilter-survey sgpdd-survey ost-survey ior-survey stats-collect
 
 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
        rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz