diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-05 09:06:06 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 2000-11-05 09:06:06 +0000 |
| commit | de16accdd048e3b393b0e531a7874e3aa696a2c7 (patch) | |
| tree | 0fbf734fbdbfcde90d35d4f30ed3c5779252faa0 /usr.bin/file/Makefile | |
| parent | e1d1cf43d789ec88f2bd7ba88b26a9c9dfdfe13e (diff) | |
| download | src-de16accdd048e3b393b0e531a7874e3aa696a2c7.tar.gz src-de16accdd048e3b393b0e531a7874e3aa696a2c7.zip | |
Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.
Notes
Notes:
svn path=/head/; revision=68352
Diffstat (limited to 'usr.bin/file/Makefile')
| -rw-r--r-- | usr.bin/file/Makefile | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile index 3834e4b0b307..5fc7b1bd84e3 100644 --- a/usr.bin/file/Makefile +++ b/usr.bin/file/Makefile @@ -24,23 +24,28 @@ # # Hacked and dismembered for bmake (Geoff Rehmet). -MAGICDIR= /usr/share/misc +MAGICDIR= /usr/share/misc/magic MAGICMODE= 444 -CFLAGS+= -DMAGIC='"$(MAGICDIR)/magic"' -DBUILTIN_ELF +SRCDIR= ${.CURDIR}/../../contrib/file +.PATH: ${SRCDIR} + +CFLAGS+= -DMAGIC='"$(MAGICDIR)"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H +CFLAGS+= -I${.CURDIR} PROG= file SRCS= file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \ - compress.c is_tar.c readelf.c internat.c print.c + compress.c is_tar.c readelf.c print.c +# compress.c is_tar.c readelf.c internat.c print.c MAN1= file.1 MAN5= magic.5 CLEANFILES+= magic -MAGFILES= $(.CURDIR)/Magdir/Header\ - $(.CURDIR)/Magdir/Localstuff\ - $(.CURDIR)/Magdir/[a-z]* +MAGFILES= ${SRCDIR}/Header\ + ${SRCDIR}/Localstuff\ + ${SRCDIR}/Magdir/[a-z]* all: file magic @@ -49,6 +54,6 @@ magic: $(MAGFILES) beforeinstall: $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \ - magic $(DESTDIR)$(MAGICDIR)/magic + magic $(DESTDIR)$(MAGICDIR) .include <bsd.prog.mk> |