projects / packages / file.git / blame
| Commit | Line | Data |
|---|---|---|
| 7abc2151 ER |
1 | still search in /etc/magic |
| 2 | still use ~/.magic by default | |
| 3 | ||
| 4 | --- file-5.04/src/Makefile.am 2010-07-21 18:56:10.000000000 +0300 | |
| 5 | +++ file-5.04/src/Makefile.am 2010-12-23 13:27:13.810960488 +0200 | |
| 6 | @@ -4,7 +4,7 @@ | |
| 7 | ||
| 8 | bin_PROGRAMS = file | |
| 9 | ||
| 10 | -AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' | |
| 11 | +AM_CPPFLAGS = -DMAGIC='"/etc/magic:$(MAGIC)"' | |
| 12 | AM_CFLAGS = @WARNINGS@ | |
| 13 | ||
| 14 | libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \ | |
| 15 | --- file-5.04/src/magic.c~ 2009-09-14 20:50:38.000000000 +0300 | |
| 16 | +++ file-5.04/src/magic.c 2010-09-20 17:14:49.000000000 +0300 | |
| 17 | @@ -84,5 +89,5 @@ | |
| 18 | private const char * | |
| 19 | get_default_magic(void) | |
| 20 | { | |
| 21 | - static const char hmagic[] = "/.magic/magic.mgc"; | |
| 22 | + static const char hmagic[] = "/.magic"; | |
| 23 | static char default_magic[2 * MAXPATHLEN + 2]; |