Don't try to programatically support running file(1) w/in /usr/obj or other

non-standard install path.

Agreed with:	ru
This commit is contained in:
David E. O'Brien 2004-08-09 11:05:09 +00:00
parent acabf29a1b
commit 7866c62aa6
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=133370
2 changed files with 2 additions and 2 deletions

View File

@ -11,7 +11,7 @@ MAN= libmagic.3 magic.5
SRCS= apprentice.c apptype.c ascmagic.c compress.c fsmagic.c funcs.c \
is_tar.c magic.c print.c readelf.c softmagic.c
MAGICPATH?= ${DESTDIR}/usr/share/misc
MAGICPATH?= /usr/share/misc
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR} -I${CONTRDIR}

View File

@ -25,7 +25,7 @@ SRCDIR= ${.CURDIR}/../../contrib/file
PROG= file
MAGICPATH?= ${DESTDIR}/usr/share/misc
MAGICPATH?= /usr/share/misc
CFLAGS+= -DMAGIC='"${MAGICPATH}/magic"' -DHAVE_CONFIG_H
CFLAGS+= -I${.CURDIR} -I${SRCDIR}