--- Makefile.orig	Wed Jan 21 11:33:02 2004
+++ Makefile	Wed Feb 18 10:43:15 2004
@@ -26,12 +26,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-PREFIX=/usr
-MANDIR=$(PREFIX)/man/man8
-CC=gcc
-#CFLAGS=-Wall -ggdb
-CFLAGS=-Wall -O2
-LDFLAGS=-L. -lripmime -lpcre #-static
+PREFIX?=	/usr
+MANDIR?=	$(PREFIX)/man/man8
+CC?=		gcc
+#CFLAGS=	-Wall -ggdb
+CFLAGS+=	-Wall -O2 -I${PREFIX}/include
+LDFLAGS+=	-L. -lripmime -lpcre ${_LDFLAGS}
 
 OBJECTS=getline.o parsefile.o p3scan.o \
 	scanner_basic.o scanner_avpd.o scanner_trophie.o
@@ -62,8 +62,8 @@
 
 dep depend .dep:
 	@echo "creating depencies"
-	rm .tmp.dep -f
-	@find -name "*.c"   -maxdepth 1 -print0 | xargs -n 1 -0rt $(CC) -M $(CFLAGS)  >>.tmp.dep
+	rm -f .tmp.dep
+	@find . -name "*.c"   -maxdepth 1 -print0 | xargs -n 1 -0t $(CC) -M $(CFLAGS)  >>.tmp.dep
 	mv .tmp.dep .dep
 	    
 install: p3scan
@@ -143,9 +143,9 @@
 
 fulltags:
 	@#VIM Users know why! *g*
-	find -name "*.c" -maxdepth 1 -print0 \
+	find . -name "*.c" -maxdepth 1 -print0 \
 	| xargs -n 1 -0r $(CC) -M -H $(CFLAGS) 2>.totag >/dev/null
-	find -name "*.c" -maxdepth 1 -print0 \
+	find . -name "*.c" -maxdepth 1 -print0 \
 	| xargs -n 1 -0r echo >>.totag
 	cat .totag | sed "s/^[[:space:]]*//" | grep -v "^$(CC)" | sort | uniq >.totag
 	ctags --c-types=+c+p+f+x -L .totag .