aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2003-07-26 02:39:33 (GMT)
committerJouni Malinen <j@w1.fi>2003-07-26 02:39:33 (GMT)
commit593575cffe144a99eb201c60b177340683169e32 (patch)
tree7654a25f75a1a2e225bd62c02de0f81a5c3ac205
parenteceec7d303e38301df246277ea675f90b3adc1e4 (diff)
downloadhostap-history-593575cffe144a99eb201c60b177340683169e32.zip
hostap-history-593575cffe144a99eb201c60b177340683169e32.tar.gz
hostap-history-593575cffe144a99eb201c60b177340683169e32.tar.bz2
Allow compilation with Linux 2.6.x.
-rw-r--r--Makefile17
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 57fe769..5d204a6 100644
--- a/Makefile
+++ b/Makefile
@@ -63,12 +63,12 @@ CURRENTKV := $(shell echo `uname -r`)
MSRC=driver/modules
# if Rules.make exists in the kernel tree, we assume 2.4 style modules
-# if it doesn't assume 2.5 style
+# if it doesn't assume 2.6 style
OLDMAKE = $(wildcard $(KERNEL_PATH)/Rules.make)
ifeq (,$(OLDMAKE))
-all: 2.5
+all: 2.6
else
all: 2.4
endif
@@ -100,7 +100,7 @@ endif
# Old compilation using this Makefile and not the build system in the kernel
# tree. This is used when compiling for Linux 2.2.x (or Linux 2.4.x with
-# 'make pccard'). Both Linux 2.5.x and 2.4.x can use kernel tree build system
+# 'make pccard'). Both Linux 2.6.x and 2.4.x can use kernel tree build system
# with 'make'.
ifdef CONFIG_MODVERSIONS
@@ -142,9 +142,10 @@ endif
$(MAKE) -C $(KERNEL_PATH) SUBDIRS=$(PWD)/driver/modules modules
$(MAKE) install_all_info
-2.5:
- @if ! echo "$(KERNELRELEASE)" | grep -q "^2\.5"; then \
- echo "*** Can't build for 2.5 with a non-2.5 source!"; \
+2.6:
+ @if ! echo "$(KERNELRELEASE)" | grep -q "^2\.6" && \
+ ! echo "$(KERNELRELEASE)" | grep -q "^2\.5"; then \
+ echo "*** Can't build for 2.6 with a non-2.6 source!"; \
exit 1; \
fi
$(MAKE) -C $(KERNEL_PATH) SUBDIRS=$(PWD)/driver/modules \
@@ -191,7 +192,7 @@ install_all_info:
ifeq (,$(OLDMAKE))
-install: install_2.5
+install: install_2.6
else
install: install_2.4
endif
@@ -208,7 +209,7 @@ install_check:
install_2.4: uninstall install_pccard install_pci install_plx
-install_2.5: install_conf
+install_2.6: install_conf
$(MAKE) install_check
@echo "*** Copying modules to: $(MODPATH)/kernel/drivers/net/wireless"
mkdir -p $(MODPATH)/kernel/drivers/net/wireless