X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=7ed257214ce966f546bc2abdba640f818772e78c;hb=fdb061c9ce3fd16e805ff07b1e80c8de46110004;hp=72b41a2da94f309165ec2c34e22a0a22887382a4;hpb=eaeefb97e6b326d59e3ce76c03aad35b7e17c1f3;p=fs%2Flustre-release.git

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 72b41a2..7ed2572 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ portals lustre
-DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio portals lustre
+SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
+DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet lustre
 
 EXTRA_DIST := config.h.in
 
@@ -28,7 +28,7 @@ tags:
 
 if MODULES
 all-sources:
-	$(MAKE) sources -C portals
+	$(MAKE) sources -C lnet
 	$(MAKE) sources -C lustre
 
 if LINUX
@@ -57,14 +57,18 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
-	find $(distdir) -name .deps | xargs rm -rf
-	find $(distdir) -name CVS | xargs rm -rf
+	find $(distdir) -name .deps -o \
+			-name CVS -o \
+			-name .svn -o \
+			-name .#* | xargs rm -rf
 
 build/lustre.spec: build/lustre.spec.in config.status
 	./config.status build/lustre.spec
 
 rpms: build/lustre.spec dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
+	rpmbuild -ta $(distdir).tar.gz \
+			--define "_tmppath $TMP"
 
 srpm: build/lustre.spec dist Makefile
-	rpmbuild -ts $(distdir).tar.gz
+	rpmbuild -ts $(distdir).tar.gz \
+			--define "_tmppath $TMP"