From 2f38694f0e7dd171f6b9be0fb205463c0c7f442f Mon Sep 17 00:00:00 2001 From: "robert.read" Date: Thu, 3 Jul 2008 19:48:16 +0000 Subject: [PATCH] Branch HEAD b=15998 i=adilger Fix make rpms on HEAD. --- autoMakefile.am | 2 +- build/autoMakefile.am.toplevel | 1 + lustre-iokit/Makefile.am | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/autoMakefile.am b/autoMakefile.am index 6601397b..2a9976f 100644 --- 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 -RPM_SUBDIRS := @LDISKFS_SUBDIR@ +RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@ if LDISKFS_ENABLED EXTRA_SOURCES := @SYMVERFILE@ endif diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel index dfb9624..3547b40 100644 --- a/build/autoMakefile.am.toplevel +++ b/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 \ diff --git a/lustre-iokit/Makefile.am b/lustre-iokit/Makefile.am index c2bcb86..a654ff6 100644 --- 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 -EXTRA_DIST = lustre-iokit.spec +EXTRA_DIST = lustre-iokit.spec -rpm: dist +rpms rpm: dist rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz -- 1.8.3.1