Remove -g from build Fix lost code from tdfx-1-1 merge in tdfx_priv.c Lower

    the minimum required fifo size Fix the kernel tree detection in the
    Makefile

1 files changed, 11 insertions, 3 deletions

diff --git a/linux/Makefile.linux b/linux/Makefile.linux
index 2b3ccab7..b91d5984 100644
--- a/linux/Makefile.linux
+++ b/linux/Makefile.linux
@@ -70,12 +70,20 @@ VERSION := $(shell uname -r)
 A := /usr/src/linux-$(VERSION)/include
 B := /usr/src/linux/include
 C := /usr/include
+# This detection seems to be broken.
+#TREE := $(shell                                                   \
+#	if grep -q $(VERSION) $A/linux/version.h; then echo $A;   \
+#	elif grep -q $(VERSION) $B/linux/version.h; then echo $B; \
+#	elif grep -q $(VERSION) $C/linux/version.h; then echo $C; \
+#	else echo 0; fi)
+# I'm simplifying it
 TREE := $(shell                                                   \
-	if grep -q $(VERSION) $A/linux/version.h; then echo $A;   \
-	elif grep -q $(VERSION) $B/linux/version.h; then echo $B; \
-	elif grep -q $(VERSION) $C/linux/version.h; then echo $C; \
+	if [ -d $A ] ; then echo $A;   \
+	elif [ -d $B ] ; then echo $B; \
+	elif [ -d $C ] ; then echo $C; \
 	else echo 0; fi)
 
+
 ifeq "$TREE" "0"
 all:; echo Error: Could not locate kernel tree
 else