up to 5.14, release intended to fix 5.13 bugs

[packages/file.git] / automake.patch

--- file-5.08/magic/Makefile.am	2011-08-07 13:28:39.719588222 +0300
+++ file-5.08/magic/Makefile.am	2011-08-07 16:53:54.377119273 +0300
@@ -5,11 +5,14 @@
 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 \
+$(MAGIC_FILES)
+
+MAGIC_FILES = \
 $(MAGIC_FRAGMENT_DIR)/acorn \
 $(MAGIC_FRAGMENT_DIR)/adi \
 $(MAGIC_FRAGMENT_DIR)/adventure \
@@ -135,6 +138,7 @@
 $(MAGIC_FRAGMENT_DIR)/modem \
 $(MAGIC_FRAGMENT_DIR)/motorola \
 $(MAGIC_FRAGMENT_DIR)/mozilla \
+$(MAGIC_FRAGMENT_DIR)/mscompress \
 $(MAGIC_FRAGMENT_DIR)/msdos \
 $(MAGIC_FRAGMENT_DIR)/msooxml \
 $(MAGIC_FRAGMENT_DIR)/msvc \
@@ -238,10 +242,12 @@
 $(MAGIC_FRAGMENT_DIR)/xo65 \
 $(MAGIC_FRAGMENT_DIR)/xwindows \
 $(MAGIC_FRAGMENT_DIR)/zilog \
+$(MAGIC_FRAGMENT_DIR)/zisofs \
 $(MAGIC_FRAGMENT_DIR)/zyxel 
 
-MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
+MAGIC = magic
+MAGIC_MGC = magic.mgc
+CLEANFILES = $(MAGIC) $(MAGIC_MGC) $(MAGIC_FRAGMENT_DIR)/Localstuff
 
 # FIXME: Build file natively as well so that it can be used to compile
 # the target's magic file; for now we bail if the local version does not match
@@ -253,9 +259,10 @@
 FILE_COMPILE_DEP = $(FILE_COMPILE)
 endif
 
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
-	@rm -fr magic
-	@mkdir magic && cp -p $(EXTRA_DIST) magic
+$(MAGIC): $(MAGIC_DIR)/Header $(MAGIC_FILES)
+	cat $(MAGIC_DIR)/Header $(MAGIC_FILES) > $@
+
+$(MAGIC_MGC): $(MAGIC) $(FILE_COMPILE_DEP)
 	@(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
 	    echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
 	  else \
@@ -271 +278,4 @@
-	@rm -fr magic
+
+install-data-local:
+	install -d $(DESTDIR)$(sysconfdir)
+	cp -p $(MAGIC_DIR)/Localstuff $(DESTDIR)$(sysconfdir)/magic