From 5a7612fe44b345e9b485a74e787765d0e3435b83 Mon Sep 17 00:00:00 2001
From: obrien <obrien@FreeBSD.org>
Date: Mon, 30 Jul 2001 03:50:04 +0000
Subject: Update to version 3.36. I had to hack print.c due to some new bits
 that only compile on NetBSD. I could not figure what the analogous FreeBSD
 bits are.

---
 usr.bin/file/Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/file/Makefile b/usr.bin/file/Makefile
index e9c186a..b7d212e 100644
--- a/usr.bin/file/Makefile
+++ b/usr.bin/file/Makefile
@@ -31,11 +31,11 @@ SRCDIR=		${.CURDIR}/../../contrib/file
 .PATH:		${SRCDIR}
 
 CFLAGS+=	-DMAGIC='"$(MAGICFILE)"' -DBUILTIN_ELF -DELFCORE -DHAVE_CONFIG_H
-CFLAGS+=	-I${.CURDIR}
+CFLAGS+=	-I${.CURDIR} -I${SRCDIR}
 
 PROG=		file
 SRCS=		file.c apprentice.c fsmagic.c softmagic.c ascmagic.c \
-		compress.c is_tar.c  readelf.c print.c
+		compress.c is_tar.c  readelf.c print-hacked.c
 #		compress.c is_tar.c  readelf.c internat.c print.c
 
 MAN=		file.1 magic.5
@@ -51,6 +51,10 @@ all:	file magic
 magic:	$(MAGFILES)
 	cat $(MAGFILES) > $(.TARGET)
 
+CLEANFILES+=	print-hacked.c
+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)
-- 
cgit v1.1