r=nathan

[fs/lustre-release.git] / build / lustre.spec.in

diff --git a/build/lustre.spec.in b/build/lustre.spec.in
index 0101a7e..78b770c 100644 (file)
--- a/build/lustre.spec.in
+++ b/build/lustre.spec.in
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 
 # Set an explicit path to our Linux tree, if we can.
 cd $RPM_BUILD_DIR/lustre-%{version}
-./configure @ac_configure_args@ \
+./configure @ac_configure_args@ %{?configure_flags:configure_flags} \
        --sysconfdir=%{_sysconfdir} \
        --mandir=%{_mandir} \
        --libdir=%{_libdir}
@@ -134,9 +134,8 @@ if [ -d $RPM_BUILD_ROOT%{_libdir}/lustre/snmp ] ; then
 fi
 
 # Have universal lustre headers 
-if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre_idl.h ] ; then
-  echo '%attr(-, root, root) /usr/include/lustre_idl.h' >>lustre.files
-  echo '%attr(-, root, root) /usr/include/linux/lustre_idl.h' >>lustre.files
+if [ -f $RPM_BUILD_DIR/lustre-%{version}/lustre/include/lustre/lustre_idl.h ] ; then
+  echo '%attr(-, root, root) /usr/include/lustre/lustre_idl.h' >>lustre.files
   echo '%attr(-, root, root) /usr/include/linux/lustre_types.h' >>lustre.files
   echo '%attr(-, root, root) /usr/include/linux/lustre_user.h' >>lustre.files
 else