Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the magic.mime problem correctly: the input file gets a different 

name.
This commit is contained in:
thorpej 2002-03-24 22:12:59 +00:00
parent 26e4cbfa71
commit d70c41a1fb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/file/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.38 2002/03/24 17:16:22 wiz Exp $
# $NetBSD: Makefile,v 1.39 2002/03/24 22:12:59 thorpej Exp $
.include <bsd.own.mk>
@ -18,7 +18,7 @@ CPPFLAGS+= -DMAGIC='"${MAGIC}"' -DHAVE_CONFIG_H -I${.CURDIR}
CPPFLAGS+= -DQUICK -DBUILTIN_ELF -DELFCORE
MAN= file.1 magic.5
CLEANFILES+= mkmagic magic magic.mgc magic.mime.mgc
CLEANFILES+= mkmagic magic magic.mgc magic.mime magic.mime.mgc
.if ${MKSHARE} != "no"
realall: file magic magic.mgc magic.mime.mgc
.endif
@ -33,17 +33,19 @@ MAGFILES= ${.CURDIR}/Header \
magic: ${MAGFILES}
cat ${MAGFILES} > ${.TARGET}
magic.mgc: mkmagic magic
magic.mgc: mkmagic magic
./mkmagic magic
magic.mime: magic.mime.in
cp ${.CURDIR}/magic.mime.in ./magic.mime
magic.mime.mgc: mkmagic magic.mime
[ -f magic.mime ] || cp ${.CURDIR}/magic.mime ./magic.mime
./mkmagic ./magic.mime
.else
magic:
.endif
mkmagic: apprentice.c print.c
mkmagic: apprentice.c print.c
${HOST_LINK.c} -o mkmagic -DHAVE_CONFIG_H -DQUICK -DCOMPILE_ONLY \
-I${.CURDIR} ${.CURDIR}/apprentice.c ${.CURDIR}/print.c

2
usr.bin/file/magic.mime → usr.bin/file/magic.mime.in
View File

@ -1,4 +1,4 @@
# $NetBSD: magic.mime,v 1.4 2001/07/22 22:53:02 pooka Exp $
# $NetBSD: magic.mime.in,v 1.1 2002/03/24 22:13:00 thorpej Exp $
#
# Magic data for KMimeMagic (originally for file(1) command)
#