Use make distdir to generate a pristine source tree because we need to keep around...

diff --git a/lustre/configure.in b/lustre/configure.in
index 482ecf3..d4bed74 100644 (file)
--- a/lustre/configure.in
+++ b/lustre/configure.in
@@ -49,7 +49,8 @@ KINCFLAGS='-I. -I$(top_srcdir)/include -I$(PORTALS)/include -I$(LINUX)/include'
 CPPFLAGS="$KINCFLAGS $ARCHCPPFLAGS"
 
 portalsdir_def='$(top_srcdir)/../portals'
-AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] set path to Portals source (default=../portals)],, enable_portalsdir=$portalsdir_def)
+AC_ARG_WITH(portals, [  --with-portals=[path] set path to Portals source (default=../portals)], enable_portalsdir=$withval)
+AC_ARG_ENABLE(portalsdir, [  --enable-portalsdir=[path] (deprecated) set path to Portals source (default=../portals)],, enable_portalsdir=$portalsdir_def)
 PORTALS=$enable_portalsdir
 AC_SUBST(PORTALS)
 

diff --git a/lustre/scripts/lustre.spec.in b/lustre/scripts/lustre.spec.in
index 4af6d67..620bf5b 100644 (file)
--- a/lustre/scripts/lustre.spec.in
+++ b/lustre/scripts/lustre.spec.in
@@ -26,22 +26,22 @@ Group: Development/Kernel
 %description -n lustre-modules
 Lustre file System, server and network drivers for Linux %{kversion}.
 
+%package -n lustre-source
+Summary: Object-Based Disk storage driver source
+Group: Development/Kernel
+
+%description -n lustre-source
+Lustre Lite Source for further development
+
 %package -n lustre-doc
 Summary: Documentation and sample configuration files
 Group: Documentation
 # FIXME: BuildArch overrides all the packages in rpm 4.0.4-7x
-#BuildArch: noarch
+BuildArch: noarch
 
 %description -n lustre-doc
 Documentation and sample configuration files for Lustre
 
-%package -n lustre-source
-Summary: Object-Based Disk storage driver source
-Group: Development/Kernel
-
-%description -n lustre-source
-Lustre Lite Source for further development
-
 %prep
 %setup -qn lustre-%{version}
 
@@ -56,10 +56,10 @@ make
 make install prefix=$RPM_BUILD_ROOT
 
 # Create the pristine source directory.
-make distclean
-mkdir -p $RPM_BUILD_ROOT/usr/src/lustre-%{version}
-find . -print | cpio -ap  $RPM_BUILD_ROOT/usr/src/lustre-%{version}
-
+mkdir -p $RPM_BUILD_ROOT/usr/src
+rm -f lustre-source
+ln -s $RPM_BUILD_ROOT/usr/src lustre-source
+make distdir distdir=lustre-source/lustre-%{version}
 
 %files
 %attr(-, root, root) /usr/sbin/lmc