projects / packages / file.git / blame
| Commit | Line | Data |
|---|---|---|
| 7abc2151 ER |
1 | --- file-5.05/magic/Makefile.am~ 2011-01-18 19:19:39.000000000 +0200 |
| 2 | +++ file-5.05/magic/Makefile.am 2011-01-18 19:21:23.958686512 +0200 | |
| 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 | ||
| 10 | EXTRA_DIST = \ | |
| 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 \ | |
| 19 | @@ -236,8 +239,9 @@ | |
| 20 | $(MAGIC_FRAGMENT_DIR)/dump \ | |
| 21 | $(MAGIC_FRAGMENT_DIR)/zyxel | |
| 22 | ||
| 23 | -MAGIC = magic.mgc | |
| 24 | -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff | |
| 25 | +MAGIC = magic | |
| 26 | +MAGIC_MGC = magic.mgc | |
| 27 | +CLEANFILES = $(MAGIC) $(MAGIC_MGC) $(MAGIC_FRAGMENT_DIR)/Localstuff | |
| 28 | ||
| 29 | # FIXME: Build file natively as well so that it can be used to compile | |
| 30 | # the target's magic file | |
| 31 | @@ -253,8 +253,12 @@ | |
| 32 | FILE_COMPILE_DEP = $(FILE_COMPILE) | |
| 33 | endif | |
| 34 | ||
| 35 | -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) | |
| 36 | - @rm -fr magic | |
| 37 | - @mkdir magic && cp -p $(EXTRA_DIST) magic | |
| 38 | - $(FILE_COMPILE) -C -m magic | |
| 39 | - @rm -fr magic | |
| 40 | +$(MAGIC): $(MAGIC_DIR)/Header $(MAGIC_FILES) | |
| 41 | + cat $(MAGIC_DIR)/Header $(MAGIC_FILES) > $@ | |
| 42 | + | |
| 43 | +$(MAGIC_MGC): $(MAGIC) $(FILE_COMPILE_DEP) | |
| 44 | + $(FILE_COMPILE) -C -m $< | |
| 45 | + | |
| 46 | +install-data-local: | |
| 47 | + install -d $(DESTDIR)$(sysconfdir) | |
| 48 | + cp -p $(MAGIC_DIR)/Localstuff $(DESTDIR)$(sysconfdir)/magic |