- simplify kernel modules install

Changed files:
    rpm.macros -> 1.403

diff --git a/rpm.macros b/rpm.macros
index 5bafd7603290271a12b1f63624d055165a337b35..842cf6210c1f2e89570b585aae6e06a3b73fafe6 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1246,23 +1246,16 @@ compile %{*}\
 %define KernelD $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}                     \
 %define ModprobeD $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/%{_kernel_ver} \
                                                                                                                                        \
-install -d %{KernelD}/%{-d*}                                                                   \
-%{?-s:install -d %{ModprobeD}}                                                         \
+install -d %{KernelD}/%{-d*}                                                                           \
+%{?-s:install -d %{ModprobeD}}                                                                         \
                                                                                                                                        \
 for MODULE in {%{-m*},}; do                                                                                    \
        [ -n "${MODULE}" ] || continue                                                                  \
        MNAME=${MODULE##*/}                                                                                             \
-       %if %{without dist_kernel}                                                                              \
-               install ${MODULE}-nondist.ko                                                            \\\
-                       %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                              \
-               %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"                                     \\\
-                       >> %{ModprobeD}/%{-n*}.conf}                                                    \
-       %else                                                                                                                   \
-               install ${MODULE}-dist.ko                                                                               \\\
-                       %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                              \
-               %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"                                     \\\
-                       >> %{ModprobeD}/%{-n*}.conf}                                                    \
-       %endif                                                                                                                  \
+       install ${MODULE}-%{!?with_dist_kernel:non}dist.ko
+               %{KernelD}/%{-d*}/${MNAME}%{-s:-%{-s*}}.ko                                      \
+       %{?-s:echo "alias ${MNAME} ${MNAME}-%{-s*}"                                             \\\
+               >> %{ModprobeD}/%{-n*}.conf}                                                            \
 done                                                                                                                           \
 %{nil}