Revert the previous commit in libmagic to make both libmagic and file(1)

use the config.h in lib/libmagic so we don't have multiple copies of the
same file in the src tree.  Having file(1) rely on files in libmagic is
slightly more logical than the previous behavior.

diff --git a/lib/libmagic/Makefile b/lib/libmagic/Makefile
index b89be11..7e1f5fd 100644 (file)
--- a/lib/libmagic/Makefile
+++ b/lib/libmagic/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/lib/libmagic/Makefile,v 1.11 2006/11/10 22:16:06 pavalos Exp $
+# $DragonFly: src/lib/libmagic/Makefile,v 1.12 2006/11/11 21:41:18 pavalos Exp $
 
 MAGICDIR= ${.CURDIR}/../../contrib/file-4/magic
 CONTRIBDIR=    ${.CURDIR}/../../contrib/file-4/src
@@ -15,7 +15,7 @@ SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c\
 INCS=  magic.h
 
 CFLAGS+= -DHAVE_CONFIG_H -DMAGIC=\"${MAGIC}\"
-CFLAGS+= -I${.CURDIR}/../../usr.bin/file -I${CONTRIBDIR}
+CFLAGS+= -I${.CURDIR} -I${CONTRIBDIR}