Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch

This commit is contained in:
Brian Behlendorf 2009-11-24 13:29:26 -08:00
commit bfc6d3687f
1 changed files with 4 additions and 4 deletions

View File

@ -66,8 +66,8 @@
%endif %endif
%else %else
# CHAOS 4.x: # CHAOS 4.x/5.x:
%if %{defined ch4} %if %{defined ch4} || %{defined ch5}
%if %{undefined kver} %if %{undefined kver}
%define klnk %{_usrsrc}/kernels/*/include/config %define klnk %{_usrsrc}/kernels/*/include/config
%define kver %((echo X; %{__cat} %{klnk}/kernel.release %define kver %((echo X; %{__cat} %{klnk}/kernel.release
@ -85,8 +85,8 @@
%endif %endif
%else %else
# RHEL 5: # RHEL 5.x/6.x:
%if %{defined el5} %if %{defined el5} || %{defined el6}
%if %{undefined kver} %if %{undefined kver}
%define klnk %{_usrsrc}/kernels/*/include/config %define klnk %{_usrsrc}/kernels/*/include/config
%define kver %((echo X; %{__cat} %{klnk}/kernel.release %define kver %((echo X; %{__cat} %{klnk}/kernel.release