Index: Makefile
===================================================================
RCS file: /home/ncvs/src/usr.bin/file/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	2001/08/08 16:19:30	1.21
+++ Makefile	2001/08/08 16:59:22
@@ -34,32 +34,25 @@
 CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
 CFLAGS+= -I${.CURDIR} -I${SRCDIR}
 
-CLEANFILES+=	magic magic.mgc magic.mime.mgc magic.mime.PITA
+CLEANFILES+=	magic
 
 MAGFILES=	${SRCDIR}/Header\
 		${SRCDIR}/Localstuff\
 		${SRCDIR}/Magdir/[a-z]*
 
-all: file magic magic.mgc magic.mime.mgc
+all: file magic
 
 magic: ${MAGFILES}
 	cat ${.ALLSRC} > ${.TARGET}
 
-magic.mgc: file magic
-	./${PROG} -C -m magic
-
-magic.mime.mgc: file magic.mime
-	ln -sf ${SRCDIR}/magic.mime magic.mime.PITA
-	./${PROG} -C -m magic.mime.PITA
-	mv magic.mime.PITA.mgc magic.mime.mgc
-
 CLEANFILES+=	print-hacked.c
 print-hacked.c: print.c
 	sed -e 's|daylight|0/*daylight*/|g' ${.ALLSRC} > ${.TARGET}
 
 beforeinstall:
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MAGICMODE} \
-	    magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc \
-	    ${DESTDIR}${MAGICPATH}
+	    magic ${SRCDIR}/magic.mime ${DESTDIR}${MAGICPATH}
+	./file -C -m ${DESTDIR}${MAGICPATH}/magic
+	./file -C -m ${DESTDIR}${MAGICPATH}/magic.mime
 
 .include <bsd.prog.mk>