From: David Schleef <ds@schleef.org>
Date: Wed, 24 May 2000 23:19:10 +0000 (+0000)
Subject: version bump, PCMCIA fixes
X-Git-Tag: r44~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b9f073b83637a1ad413e94b1ab94e61cd43307a2;p=comedi.git

version bump, PCMCIA fixes
---

diff --git a/Makefile b/Makefile
index b64a2eee..a4432c19 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 VERS1 = 0
 VERS2 = 7
-VERS3 = 39
+VERS3 = 44
 
 INSTALLDIR=/usr
 
@@ -19,6 +19,10 @@ endif
 # headers that aren't in the default location
 #RTAIDIR = /home/ds/cvs/rtai
 
+# define the following if you want to compile using PCMCIA
+# headers
+PCMCIADIR = /d/ds/stuff/pcmcia-cs-3.1.15
+
 TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
 
 .EXPORT_ALL_VARIABLES:
@@ -29,6 +33,9 @@ CFLAGS += -D__KERNEL__ -I $(LINUXDIR)/include -I $(TOPDIR)/include -I .
 CONFIG_SHELL := sh
 
 include $(LINUXDIR)/.config
+ifdef PCMCIADIR
+CONFIG_PCMCIA=y
+endif
 
 ifeq (.config,$(wildcard .config))
 include .config
@@ -59,6 +66,9 @@ CFLAGS += -I /usr/include/rtai
 endif
 endif
 
+ifdef PCMCIADIR
+CFLAGS += -I $(PCMCIADIR)/include
+endif
 
 SUBDIRS := comedi