Clean up this thing a little.

1 files changed, 23 insertions, 34 deletions

diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index c4265b9ad962..c823e184910b 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,6 +1,6 @@
+# $FreeBSD$
 # Makefile for file(1) cmd.
 # Copyright (c) Ian F. Darwin 86/09/01 - see LEGAL.NOTICE.
-# @(#)$FreeBSD$
 #
 # This software is not subject to any license of the American Telephone
 # and Telegraph Company or of the Regents of the University of California.
@@ -11,34 +11,28 @@
 #
 # 1. The author is not responsible for the consequences of use of this
 #    software, no matter how awful, even if they arise from flaws in it.
-#
 # 2. The origin of this software must not be misrepresented, either by
 #    explicit claim or by omission.  Since few users ever read sources,
 #    credits must appear in the documentation.
-#
 # 3. Altered versions must be plainly marked as such, and must not be
 #    misrepresented as being the original software.  Since few users
 #    ever read sources, credits must appear in the documentation.
-#
 # 4. This notice may not be removed or altered.
-#
-# Hacked and dismembered for bmake (Geoff Rehmet).
 
-MAGICFILE=	/usr/share/misc/magic
-MAGICMODE=	444
-
-SRCDIR=		${.CURDIR}/../../contrib/file
-.PATH:		${SRCDIR}
+SRCDIR=	${.CURDIR}/../../contrib/file
+.PATH: ${SRCDIR}
 
-CFLAGS+=	-DMAGIC='"$(MAGICFILE)"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
-CFLAGS+=	-I${.CURDIR} -I${SRCDIR}
+PROG=	file
+MAN=	file.1 magic.5
+SRCS=	file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
+	compress.c is_tar.c  readelf.c print-hacked.c
+#	compress.c is_tar.c  readelf.c internat.c print.c
 
-PROG=		file
-SRCS=		file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
-		compress.c is_tar.c  readelf.c print-hacked.c
-#		compress.c is_tar.c  readelf.c internat.c print.c
+MAGICPATH=	/usr/share/misc
+MAGICMODE=	444
 
-MAN=		file.1 magic.5
+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
 
@@ -46,17 +40,17 @@ MAGFILES=	${SRCDIR}/Header\
 		${SRCDIR}/Localstuff\
 		${SRCDIR}/Magdir/[a-z]*
 
-all:	file magic magic.mgc magic.mime.mgc
+all: file magic magic.mgc magic.mime.mgc
 
-magic:	$(MAGFILES)
-	cat $(MAGFILES) > $(.TARGET)
+magic: ${MAGFILES}
+	cat ${.ALLSRC} > ${.TARGET}
 
-magic.mgc:	file magic
-	./$(PROG) -C -m magic
+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
+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
@@ -64,13 +58,8 @@ print-hacked.c: print.c
 	sed -e 's|daylight|0/*daylight*/|g' ${.ALLSRC} > ${.TARGET}
 
 beforeinstall:
-	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
-	    magic $(DESTDIR)$(MAGICFILE)
-	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
-	    magic.mgc $(DESTDIR)$(MAGICFILE).mgc
-	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
-	    $(SRCDIR)/magic.mime $(DESTDIR)$(MAGICFILE).mime
-	$(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m $(MAGICMODE) \
-	    magic.mime.mgc $(DESTDIR)$(MAGICFILE).mime.mgc
+	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${MAGICMODE} \
+	    magic magic.mgc ${SRCDIR}/magic.mime magic.mime.mgc \
+	    ${DESTDIR}${MAGICPATH}
 
 .include <bsd.prog.mk>