|
@@ -44,17 +44,17 @@ Last-Update: 2016-06-27
|
|
|
+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
|
|
|
AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
|
|
|
|
|
|
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
|
|
|
+ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
|
|
|
--- a/src/Makefile.in
|
|
|
+++ b/src/Makefile.in
|
|
|
-@@ -340,7 +340,7 @@
|
|
|
+@@ -299,7 +299,7 @@
|
|
|
MAGIC = $(pkgdatadir)/magic
|
|
|
lib_LTLIBRARIES = libmagic.la
|
|
|
nodist_include_HEADERS = magic.h
|
|
|
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
|
|
|
+AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"'
|
|
|
AM_CFLAGS = $(CFLAG_VISIBILITY) @WARNINGS@
|
|
|
- libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
|
|
|
+ libmagic_la_SOURCES = buffer.c magic.c apprentice.c softmagic.c ascmagic.c \
|
|
|
encoding.c compress.c is_tar.c readelf.c print.c fsmagic.c \
|
|
|
--- a/doc/file.man
|
|
|
+++ b/doc/file.man
|
|
@@ -77,7 +77,7 @@ Last-Update: 2016-06-27
|
|
|
magic file
|
|
|
.Pa __MAGIC__.mgc ,
|
|
|
or the files in the directory
|
|
|
-@@ -472,12 +473,6 @@
|
|
|
+@@ -549,12 +550,6 @@
|
|
|
The order of entries in the magic file is significant.
|
|
|
Depending on what system you are using, the order that
|
|
|
they are put together may be incorrect.
|
|
@@ -87,6 +87,6 @@ Last-Update: 2016-06-27
|
|
|
-keep the old magic file around for comparison purposes
|
|
|
-(rename it to
|
|
|
-.Pa __MAGIC__.orig ) .
|
|
|
- .Sh EXAMPLES
|
|
|
- .Bd -literal -offset indent
|
|
|
- $ file file.c file /dev/{wd0a,hda}
|
|
|
+ .Sh HISTORY
|
|
|
+ There has been a
|
|
|
+ .Nm
|