SOURCES: rpm.macros - simplify kernel modules install

[glen]

Author: glen                         Date: Tue Nov  6 19:32:56 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- simplify kernel modules install

---- Files affected:
SOURCES:
   rpm.macros (1.402 -> 1.403) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.402 SOURCES/rpm.macros:1.403
--- SOURCES/rpm.macros:1.402	Wed Oct 31 23:07:54 2007
+++ SOURCES/rpm.macros	Tue Nov  6 20:32:50 2007
@@ -1246,23 +1246,16 @@
 %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}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.402&r2=1.403&f=u