aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>2007-11-16 23:22:52 -0500
committerLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>2007-11-16 23:22:52 -0500
commit7cfa7d93b330fc7c5c0f151a553522cff71091bc (patch)
tree2560defcc9ab6166627fba64ccc2bcc657c57a83
parent8ad5e804d81210843b53965f72d3baddabaaa4fd (diff)
downloadcompat-wireless-2.6-old-7cfa7d93b330fc7c5c0f151a553522cff71091bc.tar.gz
Fix makefile, using scripts before installing them
Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
-rw-r--r--Makefile24
1 files changed, 12 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index a6eff12..ec00f94 100644
--- a/Makefile
+++ b/Makefile
@@ -44,14 +44,23 @@ install:
@rm -rf $(KLIB)/$(KMODDIR)/drivers/zd1211rw-mac80211/
@$(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \
modules_install
+ @# All the scripts we can use
+ @mkdir -p /usr/lib/compat-wireless/
+ @install scripts/modlib.sh /usr/lib/compat-wireless/
+ @install scripts/madwifi-unload /usr/sbin/
+ @# This is to allow switching between drivers without blacklisting
+ @install scripts/athenable /usr/sbin/
+ @install scripts/b43enable /usr/sbin/
+ @install scripts/athload /usr/sbin/
+ @install scripts/b43load /usr/sbin/
@if [ ! -z $(MADWIFI) ]; then \
echo ;\
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 ./scripts/athenable madwifi" ;\
+ echo " sudo athenable madwifi" ;\
echo ;\
- echo Running scripts/athenable ath5k...;\
- ./scripts/athenable ath5k ;\
+ echo Running athenable ath5k...;\
+ /usr/sbin/athenable ath5k ;\
fi
@depmod -ae
@echo
@@ -68,15 +77,6 @@ install:
@# This needs testing before we add it
@#modprobe -l iwl4965
@modprobe -l zd1211rw-mac80211
- @# All the scripts we can use
- @mkdir -p /usr/lib/compat-wireless/
- @install scripts/modlib.sh /usr/lib/compat-wireless/
- @install scripts/madwifi-unload /usr/sbin/
- @# This is to allow switching between drivers without blacklisting
- @install scripts/athenable /usr/sbin/
- @install scripts/b43enable /usr/sbin/
- @install scripts/athload /usr/sbin/
- @install scripts/b43load /usr/sbin/
@echo
@echo Now run: make load
@echo