X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=7ed257214ce966f546bc2abdba640f818772e78c;hp=096edf5311f3513c65d65130768f3b56ac692d9d;hb=e52a140eb7f65a63f07dbb7e2aaff7f9e22974f2;hpb=5c8edd4c1876f9ad3207cf53ca28ce980b980c4b

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 096edf5..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@ lnet @LUSTRE_PORTALS_SUBDIR@ lustre
-DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet @LUSTRE_PORTALS_SUBDIR@ lustre
+SUBDIRS := . build @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ lnet lustre
+DIST_SUBDIRS := build @SNMP_DIST_SUBDIR@ libsysio lnet lustre
 
 EXTRA_DIST := config.h.in
 
@@ -30,7 +30,6 @@ if MODULES
 all-sources:
 	$(MAKE) sources -C lnet
 	$(MAKE) sources -C lustre
-	if [ "x@LUSTRE_PORTALS_SUBDIR@" = "xportals" ] ; then $(MAKE) sources -C @LUSTRE_PORTALS_SUBDIR@ ; fi
 
 if LINUX
 all-am: modules
@@ -58,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"