2008-01-30 00:40:55

by Reinette Chatre

Subject: [PATCH] compat-2.6: enable install on clean system

"make install" depends on "uninstall". When "make install" is run for the first
time the scripts athenable and b43enable have not yet been placed in their expected
location (/usr/sbin). This causes the build to fail when uninstall tries to use these
scripts.

Change the uninstall rule to only use these scripts if they exist in their expected
location.

Signed-off-by: Reinette Chatre <[email protected]>
---
Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index 6603ba6..7608199 100644
--- a/Makefile
+++ b/Makefile
@@ -124,6 +124,8 @@ uninstall:
@# on the misc directory.
@rm -f $(KLIB)/$(KMODDIR)/drivers/misc/eeprom_93cx6.ko
@depmod -ae
+ @if [ -x /usr/sbin/athenable ]; then /usr/sbin/athenable madwifi; fi
+ @if [ -x /usr/sbin/b43enable ]; then /usr/sbin/b43enable bcm43xx; fi
@/usr/sbin/athenable madwifi
@/usr/sbin/b43enable bcm43xx
@echo
--
1.5.3.4

2008-01-30 09:20:11

by Luis R. Rodriguez

Subject: Re: [PATCH] compat-2.6: enable install on clean system

On Jan 29, 2008 7:40 PM, Reinette Chatre <[email protected]> wrote:
> "make install" depends on "uninstall". When "make install" is run for the first
> time the scripts athenable and b43enable have not yet been placed in their expected
> location (/usr/sbin). This causes the build to fail when uninstall tries to use these
> scripts.
>
> Change the uninstall rule to only use these scripts if they exist in their expected
> location.
>
> Signed-off-by: Reinette Chatre <[email protected]>

Applied, thanks. Also made updates to account for rndis_wext -->
rndis_wlan rename.

Luis