diff -aur pcmcia-cs-3.2.1/clients/Makefile pcmcia-cs-3.2.1-StackGuard/clients/Makefile
--- linux/pcmcia-cs-3.2.1/clients/Makefile	Thu Feb 15 19:19:22 2001
+++ linux-greg/pcmcia-cs-3.2.1/clients/Makefile	Fri Mar  9 15:55:29 2001
@@ -15,6 +15,12 @@
 CPPFLAGS += $(PCDEBUG) -D__KERNEL__ -DMODULE
 CC = $(KCC) $(AFLAGS) $(KFLAGS)
 
+# if we have a StackGuard compiler, then we need to turn off the canary death handler stuff
+CFLAGS += $(shell if $(CC) -fno-canary-all-functions -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-canary-all-functions"; fi)
+CFLAGS += $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+XFLAGS += $(shell if $(CC) -fno-canary-all-functions -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-canary-all-functions"; fi)
+XFLAGS += $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+
 SRCS    = serial_cs.c memory_cs.c ftl_cs.c dummy_cs.c \
 	  sram_mtd.c iflash2_mtd.c iflash2+_mtd.c
 MODULES = serial_cs.o memory_cs.o ftl_cs.o dummy_cs.o \
diff -aur pcmcia-cs-3.2.1/modules/Makefile pcmcia-cs-3.2.1-StackGuard/modules/Makefile
--- linux/pcmcia-cs-3.2.1/modules/Makefile	Tue Feb  6 16:41:40 2001
+++ linux-greg/pcmcia-cs-3.2.1/modules/Makefile	Fri Mar  9 15:56:03 2001
@@ -15,6 +15,10 @@
 CPPFLAGS += $(PCDEBUG) -D__KERNEL__ -DMODULE
 CC = $(KCC) $(AFLAGS) $(KFLAGS)
 
+# if we have a StackGuard compiler, then we need to turn off the canary death handler stuff
+CFLAGS += $(shell if $(CC) -fno-canary-all-functions -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-canary-all-functions"; fi)
+CFLAGS += $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+
 SRCS    = cs.c cistpl.c rsrc_mgr.c bulkmem.c ds.c
 CORE    = cs.o cistpl.o rsrc_mgr.o bulkmem.o
 MODULES = pcmcia_core.o ds.o
diff -aur pcmcia-cs-3.2.1/wireless/Makefile pcmcia-cs-3.2.1-StackGuard/wireless/Makefile
--- linux/pcmcia-cs-3.2.1/wireless/Makefile	Tue Feb  6 16:41:41 2001
+++ linux-greg/pcmcia-cs-3.2.1/wireless/Makefile	Fri Mar  9 15:56:32 2001
@@ -12,6 +12,10 @@
 CPPFLAGS += $(PCDEBUG) -D__KERNEL__ -DMODULE
 CC = $(KCC) $(AFLAGS) $(KFLAGS)
 
+# if we have a StackGuard compiler, then we need to turn off the canary death handler stuff
+CFLAGS += $(shell if $(CC) -fno-canary-all-functions -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-fno-canary-all-functions"; fi)
+CFLAGS += $(shell if $(CC) -mno-terminator-canary -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mno-terminator-canary"; fi)
+
 XFLAGS = $(CFLAGS) $(CPPFLAGS) $(MFLAG) -DEXPORT_SYMTAB
 
 MODULES = netwave_cs.o wavelan_cs.o ray_cs.o wvlan_cs.o airo_cs.o airo.o
--- linux/pcmcia-cs-3.2.1/man/Makefile.orig	Wed Sep 18 07:34:03 2002
+++ linux/pcmcia-cs-3.2.1/man/Makefile	Wed Sep 18 07:35:58 2002
@@ -29,20 +29,20 @@
 install-man1-x11: $(MAN1_X11)
 ifdef HAS_FORMS
 	@mkdir -p $(XMANDIR)/man1
-	cp $(MAN1_X11) $(XMANDIR)/man1
+	cp -f $(MAN1_X11) $(XMANDIR)/man1
 endif
 
 install-man4: $(MAN4)
 	@mkdir -p $(MANDIR)/man4
-	cp *.4 $(MANDIR)/man4
+	cp -f *.4 $(MANDIR)/man4
 
 install-man5: $(MAN5)
 	@mkdir -p $(MANDIR)/man5
-	cp *.5 $(MANDIR)/man5
+	cp -f *.5 $(MANDIR)/man5
 
 install-man8: $(MAN8)
 	@mkdir -p $(MANDIR)/man8
-	cp *.8 $(MANDIR)/man8
+	cp -f *.8 $(MANDIR)/man8
 
 install: install-man1-x11 install-man4 install-man5 install-man8