r=adilger

[fs/lustre-release.git] / build / autoMakefile.am.toplevel

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 87b92a1..7ed2572 100644 (file)
--- 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
@@ -67,7 +66,9 @@ 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"