--- src/lib/libmagic/Makefile	2005/06/01 14:34:46	1.8
+++ src/lib/libmagic/Makefile	2005/06/01 15:09:11	1.9
@@ -1,8 +1,10 @@
 # $DragonFly$
 
 MAGICDIR= ${.CURDIR}/../../contrib/file-4/magic
-SRCDIR=	${.CURDIR}/../../contrib/file-4/src
-.PATH: ${SRCDIR}
+PATCHES!=	echo ${.CURDIR}/patches/*.patch
+CONTRIBDIR=	${.CURDIR}/../../contrib/file-4/src
+.PATH: ${CONTRIBDIR}
+
 
 MAGIC=	/usr/share/misc/magic
 
@@ -11,10 +13,11 @@ SHLIB_MAJOR=	2
 
 SRCS=	apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\
 	is_tar.c magic.c print.c readelf.c softmagic.c
+SRCS+=	${PATCHES}
 INCS=	magic.h
 
 CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
-CFLAGS+= -I${.CURDIR} -I${SRCDIR}
+CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR}
 
 
 
@@ -40,7 +43,7 @@ magic.mime.mgc: mkmagic.nx ${MAGICDIR}/m
 CLEANFILES+=   mkmagic.nx
 build-tools: mkmagic.nx
 
-NXCFLAGS+=	-DHAVE_CONFIG_H -DCOMPILE_ONLY -I${.CURDIR} -I${SRCDIR}
+NXCFLAGS+=	-DHAVE_CONFIG_H -DCOMPILE_ONLY -I${.CURDIR} -I${CONTRIBDIR}
 mkmagic.nx: apprentice.c funcs.c magic.c print.c
 	${NXCC} ${NXCFLAGS} ${NXLDFLAGS} ${.ALLSRC} ${NXLDLIBS} -o ${.TARGET}