summaryrefslogtreecommitdiff
path: root/usr.bin/file
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2008-11-09 23:00:43 +0000
committerMarc Espie <espie@cvs.openbsd.org>2008-11-09 23:00:43 +0000
commit894d6198a9481bfcc04ea9e80fa5fbd17d546e21 (patch)
treecf2124bdc2e73c8788372835060e45eec74d3a48 /usr.bin/file
parente5627f2bd3423221f3a4b8d1e06b4eae2921dfc7 (diff)
protect against .orig files resulting from a patch.
Diffstat (limited to 'usr.bin/file')
-rw-r--r--usr.bin/file/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index 1cc96a6de69..c498ac255ee 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2004/05/19 02:32:35 tedu Exp $
+# $OpenBSD: Makefile,v 1.11 2008/11/09 23:00:42 espie Exp $
MAGIC= /etc/magic
MAGICOWN= root
@@ -19,7 +19,7 @@ MAGFILES= $(.CURDIR)/magdir/Header\
$(.CURDIR)/magdir/OpenBSD\
$(.CURDIR)/magdir/[0-9a-z]*
magic: $(MAGFILES)
- cat $(MAGFILES) > $(.TARGET)
+ cat ${.ALLSRC:N*.orig} > $(.TARGET)
afterinstall:
${INSTALL} ${INSTALL_COPY} -o $(MAGICOWN) -g $(MAGICGRP) -m $(MAGICMODE) magic \