901-file-mgc.dpatch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051
  1. #!/bin/sh /usr/share/dpatch/dpatch-run
  2. ## 901-file-mgc.dpatch by Daniel Baumann <daniel@debian.org>
  3. ##
  4. ## DP: Reverting upstream change of stopping to build plain magic file
  5. ## DP: (Closes: #481247).
  6. @DPATCH@
  7. diff -Naurp file.orig/magic/Makefile.am file/magic/Makefile.am
  8. --- file.orig/magic/Makefile.am 2008-07-01 18:24:19.000000000 +0200
  9. +++ file/magic/Makefile.am 2008-07-01 18:24:26.000000000 +0200
  10. @@ -1,7 +1,7 @@
  11. MAGIC_FRAGMENT_BASE = Magdir
  12. MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
  13. -pkgdata_DATA = magic.mgc
  14. +pkgdata_DATA = magic.mgc magic
  15. EXTRA_DIST = Header Localstuff \
  16. $(MAGIC_FRAGMENT_DIR)/acorn \
  17. @@ -210,8 +210,20 @@ $(MAGIC_FRAGMENT_DIR)/xwindows \
  18. $(MAGIC_FRAGMENT_DIR)/zilog \
  19. $(MAGIC_FRAGMENT_DIR)/zyxel
  20. +RAW = magic
  21. MAGIC = magic.mgc
  22. -CLEANFILES = ${MAGIC}
  23. +CLEANFILES = ${MAGIC} ${RAW}
  24. +
  25. +${RAW}: Header Localstuff $(EXTRA_DIST)
  26. + cat /dev/null > $@
  27. + for frag in $(EXTRA_DIST); do \
  28. + if test -f $(srcdir)/$$frag; then \
  29. + f=$(srcdir)/$$frag; \
  30. + else \
  31. + f=$$frag; \
  32. + fi; \
  33. + cat $$f; \
  34. + done >> $@
  35. # FIXME: Build file natively as well so that it can be used to compile
  36. # the target's magic file
  37. @@ -221,6 +233,5 @@ else
  38. FILE_COMPILE = $(top_builddir)/src/file
  39. endif
  40. -${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE)
  41. - $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
  42. - @mv $(MAGIC_FRAGMENT_BASE).mgc $@
  43. +${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE) $(RAW)
  44. + $(FILE_COMPILE) -C -m $(RAW)