From a75162d17e6a2b84c963b398f7a51194789814dc Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 28 Feb 2012 16:48:00 -0800 Subject: [PATCH] compat-wireless: fix make install This issue was introduced via this patch: commit 802ea47e6316aea285f2c30d95763dd7c320eec1 Author: Rick Farina Date: Fri Feb 24 21:28:40 2012 -0500 compat-wireless: replace modprobe -l with functional equivilent Fix the regression by properly using brackets on the conditional check and also guaranteeing we output something upon success. Not sure how this could have worked. Signed-off-by: Luis R. Rodriguez --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bea01ad26029..6b6f097475b5 100644 --- a/Makefile +++ b/Makefile @@ -146,7 +146,7 @@ install-scripts: @install scripts/athload $(DESTDIR)/usr/sbin/ @install scripts/b43load $(DESTDIR)/usr/sbin/ @install scripts/iwl-load $(DESTDIR)/usr/sbin/ - @if $(modinfo ath_pci > /dev/null 2>&1); then \ + @if [ $(shell modinfo ath_pci > /dev/null 2>&1 && echo 1) ]; then \ echo -n "Note: madwifi detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ echo " sudo athenable madwifi" ;\ @@ -154,7 +154,7 @@ install-scripts: echo Running athenable ath5k...;\ $(DESTDIR)/usr/sbin/athenable ath5k ;\ fi - @if $(modinfo iwl4965 > /dev/null 2>&1); then \ + @if [ $(shell modinfo iwl4965 > /dev/null 2>&1 && echo 1) ]; then \ echo ;\ echo -n "Note: iwl4965 detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ @@ -163,7 +163,7 @@ install-scripts: echo Running iwl-enable iwlagn...;\ $(DESTDIR)/usr/sbin/iwl-enable iwlagn ;\ fi - @if $(modinfo atl1c > /dev/null 2>&1); then \ + @if [ $(shell modinfo atl1c > /dev/null 2>&1 && echo 1) ]; then \ echo ;\ echo -n "Note: atl1c detected, we're going to disable it. " ;\ echo "If you would like to enable it later you can run:" ;\ -- 2.30.2