[openap-cvs] : prism2 Makefile,1.1.1.1,1.2

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/prism2
In directory subversions:/tmp/cvs-serv27200

Modified Files:
        Makefile 
Log Message:
we now build the hostap driver in this directory, this completes the update to
the new driver.



Index: Makefile
===================================================================
RCS file: /cvsroot/openap/prism2/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile    16 Jul 2002 23:21:43 -0000      1.1.1.1
+++ Makefile    16 Jul 2002 23:32:48 -0000      1.2
@@ -1,6 +1,6 @@
 # Edit this path to match with your system (it should point to the root
 # directory of the Linux kernel source)
-KERNEL_PATH=/usr/src/linux
+KERNEL_PATH=$(TOPDIR)/linux
 
 # Systems using external pcmcia-cs package (instead of kernel-tree pcmcia
 # modules):
@@ -9,9 +9,8 @@
 # directory and compiling pcmcia-cs package or by configuring PCMCIA_PATH
 # and using this Makefile with 'make pccard; make install_pccard'.
 # Leave this blank for kernel-tree PCMCIA compilations (CONFIG_PCMCIA):
-PCMCIA_PATH=
+PCMCIA_PATH=$(TOPDIR)/pcmcia-cs
 
-CC=gcc
 CFLAGS=-O2 -D__KERNEL__ -DMODULE -Wall -c
 
 VERFILE := $(KERNEL_PATH)/include/linux/version.h
@@ -19,7 +18,7 @@
        then grep UTS_RELEASE $(VERFILE) | head -1 | cut -d" " -f3 | \
                xargs echo; \
        else uname -r; fi)
-MODPATH := /lib/modules/$(KERNELRELEASE)
+MODPATH := $(IMAGE_DIR)/lib/modules/$(KERNELRELEASE)
 MODULE_CS := hostap_cs.o
 MODULE_PLX := hostap_plx.o
 MODULE_PCI := hostap_pci.o
@@ -53,7 +52,7 @@
        $(CC) $(INCLUDES) $(CFLAGS) -o $@ $<
 
 
-all:
+all: pccard
        @echo "Select the version to be build:"
        @echo "make pccard      PC Card (PCMCIA) driver (Prism2 or Prism2.5)"
        @echo "make plx         PLX-based PCI card with PC Card"
@@ -83,7 +82,7 @@
        @echo "Run 'make install_pci' as a root to install $(MODULE_PCI)"
        @echo
 
-install: install_info
+install: install_pccard
 
 install_check:
        @if [ ! -d "$(MODPATH)" ]; then \
@@ -95,17 +94,13 @@
                exit 1; \
        fi
 
-install_pccard: install_check
+install_pccard:
        @echo "Installing $(MODULE_CS) to $(MODPATH_CS)"
        mkdir -p $(MODPATH_CS)
        cp $(MSRC)/$(MODULE_CS) $(MODPATH_CS)
-       /sbin/depmod -a
-       @if [ ! -r /etc/pcmcia/hostap_cs.conf ]; then \
+       @if [ ! -r $(IMAGE_DIR)/etc/pcmcia/hostap_cs.conf ]; then \
                echo "Installing /etc/pcmcia/hostap_cs.conf"; \
-               cp driver/etc/hostap_cs.conf /etc/pcmcia/hostap_cs.conf; \
-       fi
-       @if [ -r /etc/pcmcia/prism2.conf ]; then \
-               echo "You may need to remove old /etc/pcmcia/prism2.conf"; \
+               cp driver/etc/hostap_cs.conf 
$(IMAGE_DIR)/etc/pcmcia/hostap_cs.conf; \
        fi
 
 install_plx: install_check