]>
Commit | Line | Data |
---|---|---|
640647bd ER |
1 | --- file-5.08/magic/Makefile.am 2011-08-07 13:28:39.719588222 +0300 |
2 | +++ file-5.08/magic/Makefile.am 2011-08-07 16:53:54.377119273 +0300 | |
7abc2151 ER |
3 | @@ -5,11 +5,14 @@ |
4 | MAGIC_DIR = $(top_srcdir)/magic | |
5 | MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE) | |
6 | ||
7 | -pkgdata_DATA = magic.mgc | |
8 | +pkgdata_DATA = magic.mgc magic | |
9 | ||
6b03ce52 | 10 | MAGIC_FRAGMENTS = \ |
7abc2151 ER |
11 | $(MAGIC_DIR)/Header \ |
12 | $(MAGIC_DIR)/Localstuff \ | |
13 | +$(MAGIC_FILES) | |
14 | + | |
15 | +MAGIC_FILES = \ | |
16 | $(MAGIC_FRAGMENT_DIR)/acorn \ | |
17 | $(MAGIC_FRAGMENT_DIR)/adi \ | |
18 | $(MAGIC_FRAGMENT_DIR)/adventure \ | |
8778f9e2 JB |
19 | @@ -189,6 +189,7 @@ |
20 | $(MAGIC_FRAGMENT_DIR)/modulefile \ | |
640647bd ER |
21 | $(MAGIC_FRAGMENT_DIR)/motorola \ |
22 | $(MAGIC_FRAGMENT_DIR)/mozilla \ | |
23 | +$(MAGIC_FRAGMENT_DIR)/mscompress \ | |
24 | $(MAGIC_FRAGMENT_DIR)/msdos \ | |
25 | $(MAGIC_FRAGMENT_DIR)/msooxml \ | |
8778f9e2 | 26 | $(MAGIC_FRAGMENT_DIR)/msvc \ |
6b03ce52 | 27 | @@ -238,15 +242,17 @@ |
e550250e | 28 | $(MAGIC_FRAGMENT_DIR)/zfs \ |
640647bd ER |
29 | $(MAGIC_FRAGMENT_DIR)/zilog \ |
30 | +$(MAGIC_FRAGMENT_DIR)/zisofs \ | |
d85e161f | 31 | $(MAGIC_FRAGMENT_DIR)/zip \ |
4644a7c7 | 32 | $(MAGIC_FRAGMENT_DIR)/zyxel |
7abc2151 | 33 | |
6b03ce52 JP |
34 | EXTRA_DIST = \ |
35 | $(MAGIC_DIR)/scripts/create_filemagic_flac \ | |
36 | $(MAGIC_FRAGMENTS) | |
37 | ||
38 | ||
7abc2151 ER |
39 | -MAGIC = magic.mgc |
40 | -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff | |
41 | +MAGIC = magic | |
42 | +MAGIC_MGC = magic.mgc | |
43 | +CLEANFILES = $(MAGIC) $(MAGIC_MGC) $(MAGIC_FRAGMENT_DIR)/Localstuff | |
44 | ||
45 | # FIXME: Build file natively as well so that it can be used to compile | |
640647bd ER |
46 | # the target's magic file; for now we bail if the local version does not match |
47 | @@ -253,9 +259,10 @@ | |
7abc2151 ER |
48 | FILE_COMPILE_DEP = $(FILE_COMPILE) |
49 | endif | |
50 | ||
6b03ce52 | 51 | -${MAGIC}: $(MAGIC_FRAGMENTS) $(FILE_COMPILE_DEP) |
7abc2151 | 52 | - @rm -fr magic |
6b03ce52 | 53 | - @mkdir magic && cp -p $(MAGIC_FRAGMENTS) magic |
7abc2151 ER |
54 | +$(MAGIC): $(MAGIC_DIR)/Header $(MAGIC_FILES) |
55 | + cat $(MAGIC_DIR)/Header $(MAGIC_FILES) > $@ | |
56 | + | |
57 | +$(MAGIC_MGC): $(MAGIC) $(FILE_COMPILE_DEP) | |
aa747f51 ER |
58 | @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \ |
59 | echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \ | |
60 | else \ | |
640647bd | 61 | @@ -271 +278,4 @@ |
aa747f51 | 62 | - @rm -fr magic |
7abc2151 ER |
63 | + |
64 | +install-data-local: | |
65 | + install -d $(DESTDIR)$(sysconfdir) | |
66 | + cp -p $(MAGIC_DIR)/Localstuff $(DESTDIR)$(sysconfdir)/magic |