| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596 |
- Author: Daniel Baumann <daniel@debian.org>
- Description: Reverting upstream change of stopping to build plain magic file (Closes: #481247).
- diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
- --- file.orig/magic/Makefile.am 2010-02-01 12:16:29.000000000 +0000
- +++ file/magic/Makefile.am 2010-02-01 12:21:54.000000000 +0000
- @@ -5,7 +5,7 @@ MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_DIR = $(top_srcdir)/magic
- MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
-
- -pkgdata_DATA = magic.mgc
- +pkgdata_DATA = magic.mgc magic
-
- EXTRA_DIST = \
- $(MAGIC_DIR)/Header \
- @@ -229,8 +229,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
- $(MAGIC_FRAGMENT_DIR)/zilog \
- $(MAGIC_FRAGMENT_DIR)/zyxel
-
- +RAW = magic
- MAGIC = magic.mgc
- -CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
- +CLEANFILES = ${RAW} ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
- +
- +${RAW}: Header Localstuff $(EXTRA_DIST)
- + cat /dev/null > $@
- + for frag in $(EXTRA_DIST); do \
- + if test -f $(srcdir)/$$frag; then \
- + f=$(srcdir)/$$frag; \
- + else \
- + f=$$frag; \
- + fi; \
- + cat $$f; \
- + done >> $@
-
- # FIXME: Build file natively as well so that it can be used to compile
- # the target's magic file
- @@ -242,7 +254,5 @@ FILE_COMPILE = $(top_builddir)/src/file
- FILE_COMPILE_DEP = $(FILE_COMPILE)
- endif
-
- -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
- - @mkdir magic && cp -p $(EXTRA_DIST) magic
- - $(FILE_COMPILE) -C -m magic
- - @rm -fr magic
- +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
- + $(FILE_COMPILE) -C -m $(RAW)
- diff -Naurp file.orig/magic/Makefile.in file/magic/Makefile.in
- --- file.orig/magic/Makefile.in 2010-02-01 12:16:29.000000000 +0000
- +++ file/magic/Makefile.in 2010-02-01 12:24:46.000000000 +0000
- @@ -171,7 +171,7 @@ top_srcdir = @top_srcdir@
- MAGIC_FRAGMENT_BASE = Magdir
- MAGIC_DIR = $(top_srcdir)/magic
- MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
- -pkgdata_DATA = magic.mgc
- +pkgdata_DATA = magic.mgc magic
- EXTRA_DIST = \
- $(MAGIC_DIR)/Header \
- $(MAGIC_DIR)/Localstuff \
- @@ -394,10 +394,22 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
- $(MAGIC_FRAGMENT_DIR)/zilog \
- $(MAGIC_FRAGMENT_DIR)/zyxel
-
- +RAW = magic
- MAGIC = magic.mgc
- CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
- @IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file
-
- +${RAW}: Header Localstuff $(EXTRA_DIST)
- + cat /dev/null > $@
- + for frag in $(EXTRA_DIST); do \
- + if test -f $(srcdir)/$$frag; then \
- + f=$(srcdir)/$$frag; \
- + else \
- + f=$$frag; \
- + fi; \
- + cat $$f; \
- + done >> $@
- +
- # FIXME: Build file natively as well so that it can be used to compile
- # the target's magic file
- @IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file
- @@ -591,11 +603,8 @@ uninstall-am: uninstall-pkgdataDATA
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- uninstall uninstall-am uninstall-pkgdataDATA
-
- -
- -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
- - @mkdir magic && cp -p $(EXTRA_DIST) magic
- - $(FILE_COMPILE) -C -m magic
- - @rm -fr magic
- +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP) $(RAW)
- + $(FILE_COMPILE) -C -m $(RAW)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
|
