compat-wireless-git-old/makefile.patch

   1 --- compat-wireless-2.6-old-build/Makefile      2008-09-15 23:45:37.000000000 +0200
   2 +++ compat-wireless-2.6-old-build/Makefile      2008-09-16 21:24:41.000000000 +0200
   3 @@ -1,10 +1,10 @@
   4  KMODDIR?=       updates
   5  KMODDIR_ARG:=   "INSTALL_MOD_DIR=$(KMODDIR)"
   6 -ifneq ($(origin $(KLIB)), undefined)
   7  KMODPATH_ARG:=  "INSTALL_MOD_PATH=$(KLIB)"
   8 -else
   9 +ifeq ($(origin $(KLIB)), undefined)
  10  KLIB:=          /lib/modules/$(shell uname -r)
  11  endif
  12 +KMODPATH_ARG:=  "INSTALL_MOD_PATH=$(DESTDIR)"
  13  export KLIB_BUILD ?=   $(KLIB)/build
  14  # Sometimes not available in the path
  15  MODPROBE := /sbin/modprobe
  16 @@ -57,75 +57,18 @@
  17         @touch $@
  18         @md5sum $(COMPAT_CONFIG) > $(CONFIG_CHECK)
  19
  20 -install: uninstall modules
  21 +install: modules
  22         $(MAKE) -C $(KLIB_BUILD) M=$(PWD) $(KMODDIR_ARG) $(KMODPATH_ARG) \
  23 -               modules_install
  24 +       modules_install
  25         @# All the scripts we can use
  26 -       @mkdir -p /usr/lib/compat-wireless/
  27 -       @install scripts/modlib.sh      /usr/lib/compat-wireless/
  28 -       @install scripts/madwifi-unload /usr/sbin/
  29 +       @mkdir -p $(DESTDIR)/usr/lib/compat-wireless/
  30 +       @mkdir -p $(DESTDIR)/usr/sbin/
  31 +       @install scripts/modlib.sh      $(DESTDIR)/usr/lib/compat-wireless/
  32 +       @install scripts/madwifi-unload $(DESTDIR)/usr/sbin/
  33         @# This is to allow switching between drivers without blacklisting
  34 -       @install scripts/athenable      /usr/sbin/
  35 -       @install scripts/b43enable      /usr/sbin/
  36 -       @install scripts/athload        /usr/sbin/
  37 -       @install scripts/b43load        /usr/sbin/
  38 -       @if [ ! -z $(MADWIFI) ]; then \
  39 -               echo ;\
  40 -               echo -n "Note: madwifi detected, we're going to disable it. "  ;\
  41 -               echo "If you would like to enable it later you can run:"  ;\
  42 -               echo "    sudo athenable madwifi"  ;\
  43 -               echo ;\
  44 -               echo Running athenable ath5k...;\
  45 -               /usr/sbin/athenable ath5k ;\
  46 -       fi
  47 -       @/sbin/depmod -ae
  48 -       @echo
  49 -       @echo "Currently detected wireless subsystem modules:"
  50 -       @echo
  51 -       @$(MODPROBE) -l mac80211
  52 -       @# rc80211_simple is a module only on 2.6.22 and 2.6.23
  53 -       @$(MODPROBE) -l cfg80211
  54 -       @$(MODPROBE) -l adm8211
  55 -       @$(MODPROBE) -l at76_usb
  56 -       @$(MODPROBE) -l ath5k
  57 -       @$(MODPROBE) -l ath9k
  58 -       @$(MODPROBE) -l b43
  59 -       @$(MODPROBE) -l b43legacy
  60 -       @$(MODPROBE) -l ssb
  61 -       @$(MODPROBE) -l iwlcore
  62 -       @$(MODPROBE) -l iwl3945
  63 -       @$(MODPROBE) -l iwlagn
  64 -       @$(MODPROBE) -l ipw2100
  65 -       @$(MODPROBE) -l ipw2200
  66 -       @$(MODPROBE) -l ieee80211
  67 -       @$(MODPROBE) -l ieee80211_crypt
  68 -       @$(MODPROBE) -l libertas_cs
  69 -       @$(MODPROBE) -l ub8xxx
  70 -       @$(MODPROBE) -l p54_pci
  71 -       @$(MODPROBE) -l p54_usb
  72 -       @$(MODPROBE) -l rt2400pci
  73 -       @$(MODPROBE) -l rt2500pci
  74 -       @$(MODPROBE) -l rt2500usb
  75 -       @$(MODPROBE) -l rt61pci
  76 -       @$(MODPROBE) -l rt73usb
  77 -       @$(MODPROBE) -l usbnet
  78 -       @$(MODPROBE) -l cdc_ether
  79 -       @$(MODPROBE) -l rndis_host
  80 -       @$(MODPROBE) -l rndis_wlan
  81 -       @$(MODPROBE) -l rtl8180
  82 -       @$(MODPROBE) -l rtl8187
  83 -       @# rc80211_simple is no longer a module
  84 -       @#$(MODPROBE) -l rc80211_simple
  85 -       @$(MODPROBE) -l zd1211rw
  86 -       @echo
  87 -       @echo Now run:
  88 -       @echo
  89 -       @echo make unload
  90 -       @echo
  91 -       @echo And then load the wireless module you need. If unsure run:
  92 -       @echo
  93 -       @echo make load
  94 -       @echo
  95 +       @install scripts/athenable      $(DESTDIR)/usr/sbin/
  96 +       @install scripts/b43enable      $(DESTDIR)/usr/sbin/
  97 +       @install scripts/athload        $(DESTDIR)/usr/sbin/
  98
  99  uninstall:
 100         @# New location, matches upstream